From 22839ef1aee121cb9b96f4db3b0930667595022f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 10:27:19 +0800
Subject: [PATCH] 修改反馈文档bug
---
ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
index a989aa0..4cfa480 100644
--- a/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
+++ b/ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml
@@ -27,7 +27,7 @@
tup.variable_point,
tup.change_direction
FROM
- t_user_point tup
+ (select * from t_user_point union all select * from t_user_point_copy) tup
LEFT JOIN t_app_user tau ON tup.app_user_id = tau.id
<where>
tup.type not in (8, 9, 14) and tau.status != 3 and tau.del_flag = 0
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..a21ace2 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{
--
Gitblit v1.7.1