From 858d8b41a967c6267760aca0ae4bbfccc3b81654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 02 十一月 2024 20:32:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java
index 692caa6..0ee6f22 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java
@@ -55,21 +55,24 @@
getAppUserVipDetail.setVipId(user.getVipId());
R<TAppUserVipDetail> appUserVipDetail = vipDetailClient.getAppUserVipDetail(getAppUserVipDetail);
TAppUserVipDetail data1 = appUserVipDetail.getData();
- String vipJson = data1.getVipJson();
- TVip vip = JSON.parseObject(vipJson, TVip.class);
-
// 查询邀请用户获得积分配置
TIntegralRule integralRule = integralRuleClient.getSet().getData();
JSONObject jsonObject = JSONObject.parseObject(integralRule.getInviteUsersToEarnPoints());
TInviteUser inviteUser = new TInviteUser();
- inviteUser.setAppUserId(beInvitedAppUserId);
- inviteUser.setBeInvitedAppUserId(appUserId);
- inviteUser.setCreateTime(LocalDateTime.now());
- if(Objects.nonNull(vip) && vip.getDoubleIntegration() == 1){
- inviteUser.setAward(jsonObject.getInteger("num1")*2);
+ if(Objects.nonNull(data1)){
+ String vipJson = data1.getVipJson();
+ TVip vip = JSON.parseObject(vipJson, TVip.class);
+ if(Objects.nonNull(vip) && vip.getDoubleIntegration() == 1){
+ inviteUser.setAward(jsonObject.getInteger("num1")*2);
+ }else {
+ inviteUser.setAward(jsonObject.getInteger("num1"));
+ }
}else {
inviteUser.setAward(jsonObject.getInteger("num1"));
}
+ inviteUser.setAppUserId(beInvitedAppUserId);
+ inviteUser.setBeInvitedAppUserId(appUserId);
+ inviteUser.setCreateTime(LocalDateTime.now());
this.save(inviteUser);
}
}
--
Gitblit v1.7.1