修改bug

Pu Zhibing

19 小时以前 bf7ebe760405f3ab1977b015fc8e4c7a642e1871

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

@@ -2664,15 +2664,15 @@
            order.setOrderFrom(7);
            order.setShopId(shopId);
            order.setUserId(member.getUserId());
            order.setOrderMoney(originAmount);
            order.setDiscountMoney(payDiscountAmount);
            order.setReceivableMoney(payAmount);
            order.setOrderMoney(originAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
            order.setDiscountMoney(payDiscountAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
            order.setReceivableMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
            order.setPayType(1);
            order.setPayMoney(payAmount);
            order.setOnlinePayMoney(payAmount);
            order.setPayMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
            order.setOnlinePayMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
            order.setOrderRemark("快手订单");
            order.setCreateTime(new Date(create_order_time * 1000));
            order.setPayTime(new Date(pay_time * 1000));
            order.setCreateTime(new Date(create_order_time));
            order.setPayTime(new Date(pay_time));
            order.setTripartiteOrderId(data.getOrder_id());
            order.setUseTime(nowTime);
            order.setUseUserId(merVerifyOrderDto.getUserId());
@@ -4020,9 +4020,10 @@
            mgtShopOrderPageDto.setShopIds(shopIds);
        }


        System.err.println("查询条件：" + JSON.toJSONString(mgtShopOrderPageDto));
        // 从数据库中获取活动订单列表
        List<MgtActivityOrderPageVo> activityOrderPageVoList = orderMapper.pageMgtActivityOrder(page, mgtShopOrderPageDto);
        System.err.println("查询导出数据条数：" + activityOrderPageVoList.size());
        // 如果列表不为空
        if (!activityOrderPageVoList.isEmpty()) {
            // 定义变量