From 05a6a23dbbd47031a41830e168c8318567ee0b5f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 17:13:06 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 105 +++++++++++++++++++++++++---------------------------
1 files changed, 51 insertions(+), 54 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 9ed66d0..e4f6246 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -283,6 +283,7 @@
if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
order.setTechnicianId(Integer.valueOf(technicianId));
}
+ // TODO
orderMapper.updateById(order);
}
@@ -467,7 +468,7 @@
BigDecimal balance = appUser.getBalance();
if(null != orderBalancePayment){
appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
- appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+// appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
}
appUser.setBalance(balance.add(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
appUser.setShopAmount(appUser.getShopAmount().subtract(paymentAmount).setScale(2, RoundingMode.HALF_EVEN));
@@ -516,20 +517,21 @@
appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
//构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(shopPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
+ if(shopPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(shopPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ }
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
//回退优惠券状态
@@ -559,7 +561,7 @@
BigDecimal balance = appUser.getBalance();
if(null != orderBalancePayment){
appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
- appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+// appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
}
appUser.setBalance(balance.add(expressAmount).setScale(2, RoundingMode.HALF_EVEN));
//构建账户余额流水明细
@@ -593,15 +595,17 @@
appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
//构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(order.getPoint());
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
+ if(order.getPoint() > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(order.getPoint());
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ }
appUserClient.editAppUserById(appUser);
}
@@ -649,20 +653,21 @@
appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
//构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(shopPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
+ if(shopPoint > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(shopPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ }
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
@@ -709,30 +714,21 @@
appUser.setTransferablePoint(appUser.getTransferablePoint() + transferablePoint);
//构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(11);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(order.getPoint());
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
+ if(order.getPoint() > 0){
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(11);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(order.getPoint());
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ }
return R.ok();
}
- /**
- * 会员降级检测
- */
- public boolean vipDemotion(Integer shopPoint, Integer vipId){
- if(vipId == 1 || vipId > 3){
- return false;
- }
- VipSetting vipSetting = vipSettingClient.getVipSetting(vipId).getData();
- Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
- return 1 == vipLevelUpShopRole && shopPoint < vipLevelUpShop;
- }
+
/**
@@ -807,6 +803,7 @@
}
List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, orderId).eq(OrderGood::getDelFlag, 0));
int sum = orderGoods.stream().mapToInt(OrderGood::getNum).sum();
+ System.out.println("111111111111222");
orderInfo.setGoodsNum(sum);
List<Object> goodsJson = new ArrayList<>();
for (OrderGood orderGood : orderGoods) {
--
Gitblit v1.7.1