From d20ede4470f761d0c76a0c993170ebbd96a1bcc1 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 11 二月 2025 11:33:19 +0800
Subject: [PATCH] 修改物流信息导入模板
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
index 53139d1..620f03b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AgentApplicationController.java
@@ -79,7 +79,7 @@
VipSettingDto vipSettingDto = new VipSettingDto();
BeanUtils.copyProperties(vipSetting.getData(),vipSettingDto);
agentApplication.setVipSettingDto(vipSettingDto);
- agentApplication.setVipId(agentApplication.getApplicationVipId());
+ agentApplication.setVipId(agentApplication.getVipId());
return R.ok(agentApplication);
}
@@ -92,45 +92,48 @@
byId.setStatus(status);
byId.setRemark(remark);
agentApplicationService.updateById(byId);
- AppUser byId1 = appUserService.getById(byId.getAppUserId());
- //插入等级变化数据
- UserChangeLog userChangeLog = new UserChangeLog();
- userChangeLog.setCreateTime(LocalDateTime.now());
- userChangeLog.setAppUserId(byId.getAppUserId());
- userChangeLog.setBeforeVipId(byId1.getVipId());
- userChangeLog.setAfterVipId(byId.getApplicationVipId());
- if (userChangeLog.getBeforeVipId()>userChangeLog.getAfterVipId()) {
- userChangeLog.setChangeType(0);
- }else {
- userChangeLog.setChangeType(1);
- }
- userChangeLogService.save(userChangeLog);
- //变更会员等级
- byId1.setVipId(byId.getApplicationVipId());
-
- // 当用户为合伙人时，计算合伙人积分和培育积分
- Integer vipId = byId1.getVipId();
- if (vipId == 7){
- R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(1);
- BaseSetting data = baseSetting.getData();
- int basePoint = Integer.parseInt(data.getContent());
- // 当前用户计算合伙人积分
- R<VipSetting> vipSetting = vipSettingClient.getVipSetting(vipId);
- Integer point = getPoint(vipSetting, byId1, basePoint);
- byId1.setPartPoint(point);
- // 上级计算培育积分
- R<BaseSetting> baseSetting2 = baseSettingClient.getBaseSetting(1);
- BaseSetting data2 = baseSetting2.getData();
- int basePoint2 = Integer.parseInt(data2.getContent());
- Long inviteUserId = byId1.getInviteUserId();
- AppUser byId2 = appUserService.getById(inviteUserId);
- if (byId2 != null){
- Integer point1 = getPoint(vipSetting, byId2, basePoint2);
- byId2.setPartGrowPoint(point1);
+ if(2 == status){
+ AppUser byId1 = appUserService.getById(byId.getAppUserId());
+ //插入等级变化数据
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(byId.getAppUserId());
+ userChangeLog.setBeforeVipId(byId1.getVipId());
+ userChangeLog.setAfterVipId(byId.getApplicationVipId());
+ if (userChangeLog.getBeforeVipId()>userChangeLog.getAfterVipId()) {
+ userChangeLog.setChangeType(0);
+ }else {
+ userChangeLog.setChangeType(1);
}
+ userChangeLogService.save(userChangeLog);
+ //变更会员等级
+ byId1.setVipId(byId.getApplicationVipId());
+
+ // 当用户为合伙人时，计算合伙人积分和培育积分
+ Integer vipId = byId1.getVipId();
+ if (vipId == 7){
+ R<BaseSetting> baseSetting = baseSettingClient.getBaseSetting(1);
+ BaseSetting data = baseSetting.getData();
+ int basePoint = Integer.parseInt(data.getContent());
+ // 当前用户计算合伙人积分
+ R<VipSetting> vipSetting = vipSettingClient.getVipSetting(vipId);
+ Integer point = getPoint(vipSetting, byId1, basePoint);
+ byId1.setPartPoint(point);
+ // 上级计算培育积分
+ R<BaseSetting> baseSetting2 = baseSettingClient.getBaseSetting(2);
+ BaseSetting data2 = baseSetting2.getData();
+ int basePoint2 = Integer.parseInt(data2.getContent());
+ Long inviteUserId = byId1.getInviteUserId();
+ AppUser byId2 = appUserService.getById(inviteUserId);
+ if (byId2 != null){
+ Integer point1 = getPoint(vipSetting, byId1, basePoint2);
+ byId2.setPartGrowPoint(point1);
+ appUserService.updateById(byId2);
+ }
+ }
+
+ appUserService.updateById(byId1);
}
-
- appUserService.updateById(byId1);
return R.ok(byId);
}
--
Gitblit v1.7.1