From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
index c30b1d6..f310b65 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/VipCenterServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
@@ -57,7 +58,7 @@
VipSetting vipSetting = vipSettingService.getVipSettingById(4);
// 获取通过消费积分达成会员等级的开关
Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- if (vipLevelUpShopRole == 1){
+ if (null != vipLevelUpShopRole && vipLevelUpShopRole == 1){
// 消费积分阈值
Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
// 返佣积分阈值
@@ -69,7 +70,7 @@
}
Integer vipLevelUpNumRole = vipSetting.getVipLevelUpNumRole();
- if (vipLevelUpNumRole == 1){
+ if (null != vipLevelUpNumRole && vipLevelUpNumRole == 1){
// 直推钻石用户数阈值
Integer vipDirectNum = vipSetting.getVipDirectNum();
// 获取用户直推钻石用户数量
@@ -87,12 +88,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- Integer goodId = vipGood.getGoodId();
- R<Goods> goodsR = goodsClient.getGoodsById(goodId);
- if (R.isError(goodsR)){
- throw new ServiceException("商品信息获取失败");
- }
- Goods goods = goodsR.getData();
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -119,7 +115,7 @@
VipSetting vipSetting = vipSettingService.getVipSettingById(5);
// 获取通过消费积分达成会员等级的开关
Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- if (vipLevelUpShopRole == 1){
+ if (null != vipLevelUpShopRole && vipLevelUpShopRole == 1){
// 消费积分阈值
Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
// 返佣积分阈值
@@ -131,7 +127,7 @@
}
Integer vipLevelUpNumRole = vipSetting.getVipLevelUpNumRole();
- if (vipLevelUpNumRole == 1){
+ if (null != vipLevelUpNumRole && vipLevelUpNumRole == 1){
// 直推钻石用户数阈值
Integer vipDirectNum = vipSetting.getVipDirectNum();
// 获取用户直推钻石用户数量
@@ -149,12 +145,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- R<Goods> goodsR = goodsClient.getGoodsById(vipGood.getGoodId());
- if (R.isError(goodsR)){
- throw new ServiceException("商品信息获取失败");
- }
-
- Goods goods = goodsR.getData();
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -187,7 +178,7 @@
Integer sharePoint = appUser.getSharePoint();
// 获取通过消费积分达成会员等级的开关
Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- if (vipLevelUpShopRole == 1){
+ if (null != vipLevelUpShopRole && vipLevelUpShopRole == 1){
// 消费积分阈值
Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
// 返佣积分阈值
@@ -199,7 +190,7 @@
}
Integer vipLevelUpNumRole = vipSetting.getVipLevelUpNumRole();
- if (vipLevelUpNumRole == 1){
+ if (null != vipLevelUpNumRole && vipLevelUpNumRole == 1){
// 直推代理用户数阈值
Integer vipDirectNum = vipSetting.getVipDirectNum();
// 准代理用户数阈值
@@ -226,11 +217,7 @@
List<VipGood> vipGoods = vipGoodsByVipId.getData();
if (CollectionUtil.isNotEmpty(vipGoods)){
for (VipGood vipGood : vipGoods) {
- R<Goods> goodsR = goodsClient.getGoodsById(vipGood.getGoodId());
- if (R.isError(goodsR)){
- throw new ServiceException("商品信息获取失败");
- }
- Goods goods = goodsR.getData();
+ Goods goods = JSON.parseObject(vipGood.getGood_json(), Goods.class);
R<List<Order>> orderListByUserIdAndGoodsId = remoteOrderGoodsClient.getOrderListByUserIdAndGoodsId(userId, goods.getId());
if (R.isSuccess(orderListByUserIdAndGoodsId)){
List<Order> orderList = orderListByUserIdAndGoodsId.getData();
@@ -257,7 +244,7 @@
VipSetting vipSetting = vipSettingService.getVipSettingById(7);
// 获取通过消费积分达成会员等级的开关
Integer vipLevelUpShopRole = vipSetting.getVipLevelUpShopRole();
- if (vipLevelUpShopRole == 1){
+ if (null != vipLevelUpShopRole && vipLevelUpShopRole == 1){
// 消费积分阈值
Integer vipLevelUpShop = vipSetting.getVipLevelUpShop();
// 返佣积分阈值
@@ -268,7 +255,7 @@
}
Integer vipLevelUpNumRole = vipSetting.getVipLevelUpNumRole();
- if (vipLevelUpNumRole == 1){
+ if (null != vipLevelUpNumRole && vipLevelUpNumRole == 1){
// 直推代理用户数阈值
Integer vipDirectNum = vipSetting.getVipDirectNum();
// 准代理用户数阈值
@@ -324,7 +311,7 @@
@Override
public Boolean check(Integer type) {
- LoginUser loginUser = tokenService.getLoginUser();
+ LoginUser loginUser = tokenService.getLoginUserApplet();
Long userid = loginUser.getUserid();
if (type == 4){
return checkReadyToBeProxy(userid, type);
--
Gitblit v1.7.1