From c897a68da55d63439826d37be3cb13c5c0f95a48 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:13:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 2bb8ae2..defa9b3 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
@@ -1504,7 +1504,7 @@
appUserOrderGetVo.setCouponDiscount(order.getCouponMoney());
appUserOrderGetVo.setReceivableDeposit(order.getReceivableDeposit());
appUserOrderGetVo.setReceivableMoney(order.getReceivableMoney());
- appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getOnlinePayMoney()));
+ appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(null == order.getOnlinePayMoney() ? BigDecimal.ZERO : order.getOnlinePayMoney()));
appUserOrderGetVo.setPayType(order.getPayType());
appUserOrderGetVo.setPayMoney(order.getPayMoney());
appUserOrderGetVo.setOrderRemark(order.getOrderRemark());
@@ -2239,11 +2239,15 @@
BigDecimal payAmount = BigDecimal.ZERO;
//优惠金额
BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long createOrderTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long payTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
if (null != tradeOrderQueryResponseData) {
TradeOrderQueryResponseDataOrdersItem ordersItem = tradeOrderQueryResponseData.getOrders().get(0);
originAmount = BigDecimal.valueOf(ordersItem.getOriginalAmount()).divide(new BigDecimal(100));
payAmount = BigDecimal.valueOf(ordersItem.getPayAmount()).divide(new BigDecimal(100));
payDiscountAmount = BigDecimal.valueOf(ordersItem.getDiscountAmount()).divide(new BigDecimal(100));
+ createOrderTime = ordersItem.getCreateOrderTime();
+ payTime = ordersItem.getPayTime();
}
Date nowTime = new Date();
@@ -2265,12 +2269,14 @@
order.setPayMoney(payAmount);
order.setOnlinePayMoney(payAmount);
order.setOrderRemark("抖音订单");
- order.setCreateTime(nowTime);
- order.setPayTime(nowTime);
+ order.setCreateTime(new Date(createOrderTime * 1000));
+ order.setPayTime(new Date(payTime * 1000));
order.setTripartiteOrderId(data.getOrderId());
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setCloseFlag(1);
+ order.setGoodsNum(1);
+ order.setCouponMoney(BigDecimal.ZERO);
this.save(order);
//创建服务商品
//获取商品信息(商品简介,调理问题)
@@ -2501,11 +2507,15 @@
BigDecimal payAmount = BigDecimal.ZERO;
//优惠金额
BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long create_order_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long pay_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
if (null != orderDetailInfoV1) {
OpenApiOrderAmountV1 amountInfo = orderDetailInfoV1.getAmount();
originAmount = BigDecimal.valueOf(amountInfo.getTotal_amount());
payAmount = BigDecimal.valueOf(amountInfo.getPay_amount());
payDiscountAmount = originAmount.subtract(payAmount);
+ create_order_time = orderDetailInfoV1.getCreate_order_time();
+ pay_time = orderDetailInfoV1.getPay_time();
}
Date nowTime = new Date();
@@ -2527,12 +2537,14 @@
order.setPayMoney(payAmount);
order.setOnlinePayMoney(payAmount);
order.setOrderRemark("快手订单");
- order.setCreateTime(nowTime);
- order.setPayTime(nowTime);
+ order.setCreateTime(new Date(create_order_time * 1000));
+ order.setPayTime(new Date(pay_time * 1000));
order.setTripartiteOrderId(data.getOrder_id());
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
order.setCloseFlag(1);
+ order.setGoodsNum(1);
+ order.setCouponMoney(BigDecimal.ZERO);
this.save(order);
//创建服务商品
//获取商品信息(商品简介,调理问题)
--
Gitblit v1.7.1