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 | 20 ++++----------------
1 files changed, 4 insertions(+), 16 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 117cf9b..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
@@ -531,8 +531,7 @@
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
//回退优惠券状态
@@ -668,8 +667,7 @@
appUserClient.editAppUserById(appUser);
//降级检测
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
+ if(1 < appUser.getVipId() && appUser.getVipId() < 4){
appUserClient.vipDemotion(appUser.getId());
}
@@ -730,18 +728,7 @@
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;
- }
+
/**
@@ -816,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