zhanglin8526
2023-05-10 39748c770c83ff1b1e4593c5f24b147361e587c0
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -524,14 +524,15 @@
    public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto){
        String orderId = merVerifyOrderDto.getOrderId();
        BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
        BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
        Date nowTime = new Date();
        //更新订单信息
        Order order = this.getById(orderId);
        order.setOrderStatus(3);
        order.setUseTime(nowTime);
        order.setUseUserId(merVerifyOrderDto.getUserId());
        order.setOfflinePayMoney(relReceiveMoney);
        order.setPayMoney(order.getPayMoney().add(relReceiveMoney));
        order.setOfflinePayMoney(relPayMoney);
        order.setPayMoney(relReceiveMoney.add(relPayMoney));
        order.setCloseFlag(1);
        this.saveOrUpdate(order);
        //创建服务商品
@@ -788,7 +789,7 @@
            for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
                userId = merOrderPageVo.getUserId();
                member = remoteMemberService.getMember(userId).getData();
                merOrderPageVo.setUserName(member.getRealName());
                merOrderPageVo.setUserName(member.getNickName());
                merOrderPageVo.setUserMobile(member.getMobile());
                orderFrom = merOrderPageVo.getOrderFrom();
                orderFromDesc = "商城订单";