From 4b25a348feacbc6eb1b07fe2a107e3a94c6d9c4e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 15:35:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 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 7fe2df4..9ed66d0 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
@@ -6,10 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.feignClient.BalanceChangeRecordClient;
-import com.ruoyi.account.api.feignClient.UserCouponClient;
-import com.ruoyi.account.api.feignClient.UserPointClient;
+import com.ruoyi.account.api.feignClient.*;
import com.ruoyi.account.api.model.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
@@ -89,9 +86,6 @@
private UserPointClient userPointClient;
@Resource
- private PointSettingClient pointSettingClient;
-
- @Resource
private OrderBalancePaymentService orderBalancePaymentService;
@Resource
@@ -115,6 +109,9 @@
@Resource
private UserCouponClient userCouponClient;
+
+ @Resource
+ private UserChangeLogClient userChangeLogClient;
@@ -518,11 +515,6 @@
}
appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
//构建积分流水明细
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
@@ -534,6 +526,12 @@
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
appUserClient.editAppUserById(appUser);
+
+ //降级检测
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUserClient.vipDemotion(appUser.getId());
+ }
//回退优惠券状态
if(null != order.getUserCouponId()){
UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
@@ -650,11 +648,6 @@
}
appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
- boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
//构建积分流水明细
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
@@ -666,6 +659,12 @@
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
appUserClient.editAppUserById(appUser);
+
+ //降级检测
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUserClient.vipDemotion(appUser.getId());
+ }
//回退优惠券状态
if(null != order.getUserCouponId()){
--
Gitblit v1.7.1