bug修改

huliguo

3 天以前 598dd94c3dcf741c25ded76cba661ec02965a524

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

@@ -1892,6 +1892,12 @@
                merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
            }
        }
        if(null == merVerifyOrderVo.getRealReceiveMoney()){
            merVerifyOrderVo.setRealReceiveMoney(BigDecimal.ZERO);
        }
        if(null == merVerifyOrderVo.getReceiveMoney()){
            merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
        }
        merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
        merVerifyOrderVo.setUserId(order.getUserId());
        merVerifyOrderVo.setUserName(member.getRealName());
@@ -1998,9 +2004,9 @@
        }
        Member member = remoteMemberService.getMember(order.getUserId()).getData();
        //获取核销商户
        ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
        Long shopId = shopRelUserVo.getShopId();
        log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId);
//        ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
        Long shopId = member.getRelationShopId();
//        log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId);
        //获取订单商品列表
        List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
        //绑定用户判断核销商户
@@ -2066,6 +2072,7 @@
        ConsumerGoods consumerGoods;
        String consumerGoodsId;
        Goods goods;
        if(null != appUserOrderGoodsPageVoList.get(0).getGoodsId()){
        //循环生成商品服务
        List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
        for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
@@ -2125,6 +2132,7 @@
            }
        }
        consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
        }
        //生成返回
        MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
        merVerifyOrderVo.setOrderId(orderId);
@@ -2177,6 +2185,7 @@
            order.setNewMemberFlag(0);
        }
        this.saveOrUpdate(order);
        if(4 != order.getOrderFrom()){
        // 订单金额大于0时进行分账
        OrderPayment orderPayment = orderPaymentService.getOne(new QueryWrapper<OrderPayment>()
                .eq("order_id", order.getOrderId()).eq("pay_status", 2)
@@ -2197,6 +2206,7 @@
            payRecord.setPayType(merVerifyOrderDto.getPayType());
            payRecordService.save(payRecord);
        }
        }
        //更新用户积分和消费统计
        MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
        memberTotalChangeDto.setUserId(order.getUserId());