From 2d20929b57b4562959f355d20a09a474d46939dd Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 08 八月 2023 21:53:32 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 2360bd9..4b67f95 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
@@ -694,7 +694,6 @@
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(orderPayDeposit);
- order.setChangeReceivableMoney(orderPayMoney);
// 根据支付类型计算支付金额
if (appPlaceOrderDto.getPayType() == 1) {
order.setPayMoney(orderPayMoney);
@@ -711,6 +710,7 @@
order.setPayType(2);
order.setCloseFlag(0);
}
+ order.setChangeReceivableMoney(appPlaceOrderVo.getUnpaidMoney());
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
order.setGoodsNum(goodsNum);
order.setCreateTime(new Date());
@@ -1028,7 +1028,6 @@
order.setDiscountMoney(couponDiscount);
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(orderPayDeposit);
- order.setChangeReceivableMoney(orderPayMoney);
order.setActivityId(activityId);
order.setActivityName(activityGoodsGetVo.getActivityName());
// 根据支付类型设置订单支付金额，在线支付金额，订单支付金额，未支付金额，关闭标志
@@ -1039,6 +1038,7 @@
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
order.setPayType(1);
order.setCloseFlag(1);
+ order.setChangeReceivableMoney(orderGoodsMoney.subtract(couponDiscount));
} else if (appPlaceActivityDto.getPayType() == 2) {
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
@@ -1046,6 +1046,7 @@
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
order.setPayType(2);
order.setCloseFlag(0);
+ order.setChangeReceivableMoney(orderGoodsMoney.subtract(couponDiscount).subtract(orderPayDeposit));
}
// 设置订单备注，商品数量，创建时间
order.setOrderRemark(appPlaceActivityDto.getOrderRemark());
@@ -3260,11 +3261,6 @@
*/
@Override
public MerOrderTotalVo getMerOrderTotal(MerTotalDto merTotalDto) {
- if (merTotalDto.getShopAllFlag() != null && merTotalDto.getShopAllFlag() == 1) {
- List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
- merTotalDto.setShopIdList(shopIdList);
- merTotalDto.setShopId(null);
- }
if (merTotalDto.getShopAllFlag() != null && merTotalDto.getShopAllFlag() == 1) {
List<Long> shopIdList = remoteShopService.listShopIdByShopId(merTotalDto.getShopId()).getData();
merTotalDto.setShopIdList(shopIdList);
--
Gitblit v1.7.1