Merge remote-tracking branch 'origin/master'

zhanglin8526

2023-05-09 c2d38efe0c2516295abb968442ef765e3da9544d

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

@@ -344,11 +344,13 @@
            order.setPayMoney(orderPayMoney);
            order.setOnlinePayMoney(orderPayMoney);
            appPlaceOrderVo.setPayMoney(orderPayMoney);
            appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
            order.setCloseFlag(1);
        }else if(order.getPayType()==2){
            order.setPayMoney(orderPayDeposit);
            order.setOnlinePayMoney(orderPayDeposit);
            appPlaceOrderVo.setPayMoney(orderPayDeposit);
            appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
            order.setCloseFlag(0);
        }
        order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
@@ -778,6 +780,21 @@
    @Override
    public List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto){
        List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerOrder(page, merOrderPageDto);
        if(merOrderPageVoList!=null&&!merOrderPageVoList.isEmpty()){
            Long userId;
            Member member;
            Integer orderFrom;
            String orderFromDesc;
            for(MerOrderPageVo merOrderPageVo : merOrderPageVoList){
                userId = merOrderPageVo.getUserId();
                member = remoteMemberService.getMember(userId).getData();
                merOrderPageVo.setUserName(member.getRealName());
                merOrderPageVo.setUserMobile(member.getMobile());
                orderFrom = merOrderPageVo.getOrderFrom();
                orderFromDesc = "商城订单";
                merOrderPageVo.setOrderFromDesc(orderFromDesc);
            }
        }
        return merOrderPageVoList;
    }