From 2e6c812f367e1c51ec116a2eb1920872b46bfbea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 11:35:51 +0800
Subject: [PATCH] 修改订单支付金额重复添加问题
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 39e71df..bf68ed6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -450,14 +450,12 @@
BigDecimal bigDecimal = BigDecimal.ZERO;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
bigDecimal = bigDecimal.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
- myShoppingCartVo.setEarnSpendingPoints(myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber());
}
confirmOrderVo.setOrderMoney(bigDecimal);
}else{
int sum = 0;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
sum += ((null != myShoppingCartVo.getPoint() ? myShoppingCartVo.getPoint() : 0) * myShoppingCartVo.getNumber());
- myShoppingCartVo.setEarnSpendingPoints((null != myShoppingCartVo.getEarnSpendingPoints() ? myShoppingCartVo.getEarnSpendingPoints() : 0) * myShoppingCartVo.getNumber());
}
confirmOrderVo.setOrderPoint(sum);
}
@@ -466,7 +464,6 @@
BigDecimal paymentMoney = orderMoney;
//总优惠金额
BigDecimal activityAmount = BigDecimal.ZERO;
-
BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
@@ -505,7 +502,7 @@
BigDecimal goodsMoney = BigDecimal.ZERO;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
String goodsId = myShoppingCartVo.getGoodsId().toString();
- BigDecimal cash = myShoppingCartVo.getCash();
+ BigDecimal cash = myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()));
if(parseArray.contains(goodsId)){
goodsMoney = goodsMoney.add(cash);
}else{
@@ -886,7 +883,7 @@
BigDecimal goodsMoney = BigDecimal.ZERO;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
String goodsId = myShoppingCartVo.getGoodsId().toString();
- BigDecimal cash = myShoppingCartVo.getCash();
+ BigDecimal cash = myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber()));
if(parseArray.contains(goodsId)){
goodsMoney = goodsMoney.add(cash);
}else{
@@ -978,6 +975,7 @@
}
}
}
+ paymentMoney = paymentMoney.add(expressFee);
if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
paymentMoney = BigDecimal.ZERO;
}
@@ -1101,11 +1099,6 @@
}
//开始构建支付数据
- //现金支付
- paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
- if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
- paymentMoney = BigDecimal.ZERO;
- }
if(1 == shoppingCartPayment.getPaymentType()){
if(BigDecimal.ZERO.compareTo(paymentMoney) < 0){
//调起微信支付
--
Gitblit v1.7.1