From 56d62d9edb0dda9ae678dcea2323144db5d11c22 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 十二月 2024 18:06:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 60 +++++++++---------------------------------------------------
1 files changed, 9 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 1d15775..4b8acc7 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
@@ -388,7 +388,7 @@
List<PaymentUserCouponVo> data = userCouponClient.getPaymentUserCoupon(paymentUserCoupon).getData();
if(null != data){
for (PaymentUserCouponVo couponInfo : data) {
- List<Integer> forGoodIds = couponInfo.getForGoodIds();
+ List<String> forGoodIds = couponInfo.getForGoodIds();
//全部商品适用
if(null == forGoodIds){
//满减券
@@ -641,9 +641,10 @@
if(null != shoppingCartPayment.getUserCouponId() && 3 != shoppingCartPayment.getPaymentType()){
couponInfoVo = userCouponClient.getCouponInfo(shoppingCartPayment.getUserCouponId()).getData();
String forGoodIds = couponInfoVo.getForGoodIds();
- List<Integer> parseArray = JSON.parseArray(forGoodIds, Integer.class);
+ String[] split = forGoodIds.split(",");
+ List<String> parseArray = Arrays.asList(split);
//全部商品
- if(parseArray.contains(-1)){
+ if("-1".equals(forGoodIds)){
//满减
if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(paymentMoney) <= 0){
paymentMoney = paymentMoney.subtract(couponInfoVo.getDiscountAmount());
@@ -670,7 +671,7 @@
paymentMoney = BigDecimal.ZERO;
BigDecimal goodsMoney = BigDecimal.ZERO;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
- Integer goodsId = myShoppingCartVo.getGoodsId();
+ String goodsId = myShoppingCartVo.getGoodsId().toString();
BigDecimal cash = myShoppingCartVo.getCash();
if(parseArray.contains(goodsId)){
goodsMoney = goodsMoney.add(cash);
@@ -932,6 +933,8 @@
appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
+ //变更等级
+ appUserClient.vipUpgrade(appUser.getId());
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
balanceChangeRecord.setAppUserId(appUser.getId());
@@ -951,8 +954,6 @@
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
- //检查消费积分满足后升级会员
- vipUpgrade(appUser);
}
//积分支付
if(3 == shoppingCartPayment.getPaymentType()){
@@ -973,8 +974,8 @@
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
- //检查消费积分满足后升级会员
- vipUpgrade(appUser);
+ //变更等级
+ appUserClient.vipUpgrade(appUser.getId());
//构建积分流水记录
UserPoint userPoint = new UserPoint();
@@ -1077,47 +1078,4 @@
}
- /**
- * 会员等级变化
- * @param appUser
- */
- public void vipUpgrade(AppUser appUser){
- Integer shopPoint = appUser.getShopPoint();
- Integer vipId = appUser.getVipId();
- //钻石会员
- VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
- Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole();
- Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop();
- if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
- appUser.setVipId(3);
- appUserClient.editAppUserById(appUser);
- //添加等级变化记录
- UserChangeLog userChangeLog = new UserChangeLog();
- userChangeLog.setDelFlag(0);
- userChangeLog.setCreateTime(LocalDateTime.now());
- userChangeLog.setAppUserId(appUser.getId());
- userChangeLog.setBeforeVipId(vipId);
- userChangeLog.setAfterVipId(appUser.getVipId());
- userChangeLog.setChangeType(1);
- userChangeLogClient.saveUserChangeLog(userChangeLog);
- return;
- }
- //黄金会员
- VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
- vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole();
- vipLevelUpShop = vipSetting2.getVipLevelUpShop();
- if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
- appUser.setVipId(2);
- appUserClient.editAppUserById(appUser);
- //添加等级变化记录
- UserChangeLog userChangeLog = new UserChangeLog();
- userChangeLog.setDelFlag(0);
- userChangeLog.setCreateTime(LocalDateTime.now());
- userChangeLog.setAppUserId(appUser.getId());
- userChangeLog.setBeforeVipId(vipId);
- userChangeLog.setAfterVipId(appUser.getVipId());
- userChangeLog.setChangeType(1);
- userChangeLogClient.saveUserChangeLog(userChangeLog);
- }
- }
}
--
Gitblit v1.7.1