From c137760697814b57c8ccb92cb1e0ed9d873f3045 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 19:44:46 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 51 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 64920fb..7166cae 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
@@ -330,7 +330,12 @@
@Override
public Long addGoods(ShoppingCart shoppingCart) {
Long userid = tokenService.getLoginUserApplet().getUserid();
- Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
+ long goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
+ long count = count(new LambdaQueryWrapper<ShoppingCart>()
+ .eq(ShoppingCart::getGoodsId, shoppingCart.getGoodsId())
+ .eq(ShoppingCart::getStatus,1)
+ .eq(ShoppingCart::getAppUserId, userid));
+ goodsSaleNum += count;
Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + shoppingCart.getNumber()) > goods.getPurchaseLimit()){
throw new ServiceException("超出购买数量限制");
@@ -358,13 +363,7 @@
@Override
public R setGoodsNumber(SetGoodsNumber setGoodsNumber) {
- Long userid = tokenService.getLoginUserApplet().getUserid();
ShoppingCart shoppingCart = this.getById(setGoodsNumber.getId());
- Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), null, userid);
- Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
- if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + shoppingCart.getNumber()) > goods.getPurchaseLimit()){
- throw new ServiceException("超出购买数量限制");
- }
if(0 >= setGoodsNumber.getNumber()){
return R.fail("修改数量不能小于等于0");
}
@@ -1130,16 +1129,18 @@
jsonObject.put("transferablePoint", earnPoint1);
}
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(earnPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention(jsonObject.toJSONString());
- userPointClient.saveUserPoint(userPoint);
+ if(earnPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(earnPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention(jsonObject.toJSONString());
+ userPointClient.saveUserPoint(userPoint);
+ }
}
appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
@@ -1196,7 +1197,7 @@
totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
balance = balance.subtract(paymentMoney1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
- appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
distributionAmount = paymentMoney1;
}else{
@@ -1204,7 +1205,7 @@
totalDistributionAmount = BigDecimal.ZERO;
balance = balance.subtract(paymentMoney1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
- appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
distributionAmount = totalDistributionAmount;
}
@@ -1314,16 +1315,18 @@
}
//构建积分流水记录
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(orderPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
- userPointClient.saveUserPoint(userPoint);
+ if(orderPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(orderPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
+ userPointClient.saveUserPoint(userPoint);
+ }
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
@@ -1353,7 +1356,7 @@
totalDistributionAmount = totalDistributionAmount.subtract(expressFee1);
balance = balance.subtract(expressFee1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
- appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
distributionAmount = expressFee1;
}else{
@@ -1361,7 +1364,7 @@
totalDistributionAmount = BigDecimal.ZERO;
balance = balance.subtract(expressFee1);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
- appUser.setTotalDistributionAmount(totalDistributionAmount);
+// appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
distributionAmount = totalDistributionAmount;
}
@@ -1459,16 +1462,18 @@
jsonObject.put("transferablePoint", earnPoint1);
}
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(earnPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention(jsonObject.toJSONString());
- userPointClient.saveUserPoint(userPoint);
+ if(earnPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(earnPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention(jsonObject.toJSONString());
+ userPointClient.saveUserPoint(userPoint);
+ }
}
appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
@@ -1538,16 +1543,18 @@
}
//构建积分流水记录
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(orderPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
- userPointClient.saveUserPoint(userPoint);
+ if(orderPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(orderPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(appUser.getId());
+ userPoint.setObjectId(order.getId());
+ userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
+ userPointClient.saveUserPoint(userPoint);
+ }
//积分支付不反积分
--
Gitblit v1.7.1