基础配置

jiangqs

2023-06-06 92da9546e1b37b06f78671b34389b1dec9dfadfc

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -373,7 +373,7 @@
        }
        order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
        order.setGoodsNum(goodsNum);
        order.setCreateTime(DateUtils.getNowDate());
        order.setCreateTime(new Date());
        this.save(order);
        //更新用户商品类型
        if(goodsTypeSet!=null&&goodsTypeSet.size()>0){
@@ -474,7 +474,7 @@
            throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
        }
        order.setOrderStatus(0);
        order.setCancelTime(DateUtils.getNowDate());
        order.setCancelTime(new Date());
        this.saveOrUpdate(order);
    }

@@ -559,7 +559,7 @@
        String orderId = merVerifyOrderDto.getOrderId();
        BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
        BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
        Date nowTime = DateUtils.getNowDate();
        Date nowTime = new Date();
        //更新订单信息
        Order order = this.getById(orderId);
        order.setOrderStatus(3);
@@ -815,9 +815,9 @@
        }
        order.setOrderRemark(merNewOrderDto.getOrderRemark());
        order.setGoodsNum(goodsNum);
        order.setCreateTime(DateUtils.getNowDate());
        order.setPayTime(DateUtils.getNowDate());
        order.setUseTime(DateUtils.getNowDate());
        order.setCreateTime(new Date());
        order.setPayTime(new Date());
        order.setUseTime(new Date());
        order.setUseUserId(merNewOrderDto.getUserId());
        order.setPayMoney(merNewOrderDto.getPayMoney());
        order.setOnlinePayMoney(new BigDecimal("0.00"));
@@ -844,7 +844,7 @@
            consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
            consumerGoods.setUsedNum(0);
            consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
            consumerGoods.setCreateTime(DateUtils.getNowDate());
            consumerGoods.setCreateTime(new Date());
            consumerGoodsService.save(consumerGoods);
        }
        Member member = remoteMemberService.getMember(userId).getData();