From bf7ebe760405f3ab1977b015fc8e4c7a642e1871 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 13:47:20 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 4c09371..24ecc53 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/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()) {
// 定义变量
--
Gitblit v1.7.1