From b426dfa12e80fea77038c43af523abb1ec47127a Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Mon, 3 Jul 2023 16:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pluss/platform/entity/UserPromotion.java | 4 ++ .../userInfo/impl/UserInfoServiceImpl.java | 30 ++++++++++--- .../userInfo/impl/UserInfoServiceNewImpl.java | 45 +++++++++++++++++++ 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPromotion.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPromotion.java index c6d045f..da2cce5 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPromotion.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserPromotion.java @@ -27,11 +27,15 @@ public class UserPromotion { @TableField(value = "parent_user_id") private String parentUserId; + @TableField(value = "create_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date createTime; + @TableField(value = "is_extend") + private String isExtend; + @TableField(value = "update_time") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss") diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java index 2f65dbd..6961d1a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -139,13 +140,29 @@ public class UserInfoServiceImpl extends BaseUserInfoService { UserPromotion promotion= getUserPromotionByUserId(parentApp.getUserId().toString()); String parenId=promotion.getUserId().toString(); -// BigDecimal fee=promotion.get - - - + promotion=new UserPromotion(); + promotion.setUserId(userInfo.getId()); + promotion.setParentUserId(parenId); + promotion.setCurrentFee(userInfo.getCurrentFee()); + promotion.setTypeCode(userInfo.getTypeCode()); + if(userInfo.getTypeCode().equals("FB")){ + if (promotion.getCurrentFee().compareTo(userInfo.getCurrentFee()) >0|| + userInfo.getCurrentFee().compareTo(getUserPromotionByUserId("244").getCurrentFee()) < 0){ + MsgException.checkNull(null,"错误的费率信息"); + } + } + if(userInfo.getTypeCode().equals("SB")){ + if (promotion.getCurrentFee().compareTo(userInfo.getCurrentFee()) >0|| + userInfo.getCurrentFee().compareTo(getUserPromotionByUserId("244").getCurrentFee()) < 0){ + MsgException.checkNull(null,"错误的费率信息"); + } + } + promotion.setIsExtend(userInfo.getTypeCode().equals("MC")?"0":"1"); + promotion.setCreateTime(new Date()); + userPromotionMapper.insert(promotion); // 保存信息 userAppService.save(userApp); roleUserInfoService.saveRoleUserInfo(role); @@ -188,14 +205,15 @@ public class UserInfoServiceImpl extends BaseUserInfoService { // ipRecordService.saveRegIp(userInfo.getId() + "", operatorUserId); } - + @Resource private UserPromotionMapper userPromotionMapper; private UserPromotion getUserPromotionByUserId(String userId){ UserPromotion promotion= userPromotionMapper.selectById(userId); if(ObjectUtil.isNotEmpty(promotion)){ - if("FB".equals(promotion.getTypeCode())||"SB".equals(promotion.getTypeCode())||"1".equals(promotion.toString())){ + if("MG".equals(promotion.getTypeCode())||"FB".equals(promotion.getTypeCode())|| + "SB".equals(promotion.getTypeCode())||"1".equals(promotion.getIsExtend())){ return promotion; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java index 33d23e9..3abb0cc 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java @@ -1,8 +1,10 @@ package cn.pluss.platform.userInfo.impl; +import cn.hutool.core.util.ObjectUtil; import cn.pluss.platform.entity.*; import cn.pluss.platform.exception.MsgException; import cn.pluss.platform.jfShop.JfShopHandler; +import cn.pluss.platform.mapper.UserPromotionMapper; import cn.pluss.platform.roleUserInfo.RoleUserInfoService; import cn.pluss.platform.systemConfig.SystemConfigService; import cn.pluss.platform.user.UserIpRecordService; @@ -18,6 +20,7 @@ import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Date; @@ -110,6 +113,31 @@ public class UserInfoServiceNewImpl extends BaseUserInfoService { UserApp userApp = getSaveUserAppInfo(userInfo); userApp.setParentId(new Long(244)); userApp.setInviteNum(getRandomNum()); + //查找代理 + UserPromotion promotion= getUserPromotionByUserId(String.valueOf(244)); + String parenId=promotion.getUserId().toString(); + promotion=new UserPromotion(); + promotion.setUserId(userInfo.getId()); + promotion.setParentUserId(parenId); + if(userInfo.getTypeCode().equals("FB")){ + if (promotion.getCurrentFee().compareTo(userInfo.getCurrentFee()) >0|| + userInfo.getCurrentFee().compareTo(getUserPromotionByUserId("244").getCurrentFee()) < 0){ + MsgException.checkNull(null,"错误的费率信息"); + } + } + + if(userInfo.getTypeCode().equals("SB")){ + if (promotion.getCurrentFee().compareTo(userInfo.getCurrentFee()) >0|| + userInfo.getCurrentFee().compareTo(getUserPromotionByUserId("244").getCurrentFee()) < 0){ + MsgException.checkNull(null,"错误的费率信息"); + } + } + promotion.setCurrentFee(promotion.getCurrentFee()); + promotion.setTypeCode(userInfo.getTypeCode()); + promotion.setIsExtend(userInfo.getTypeCode().equals("MC")?"0":"1"); + promotion.setCreateTime(new Date()); + userPromotionMapper.insert(promotion); + // 保存信息 userAppService.save(userApp); roleUserInfoService.saveRoleUserInfo(role); @@ -161,4 +189,21 @@ public class UserInfoServiceNewImpl extends BaseUserInfoService { } } while (true); } + @Resource + private UserPromotionMapper userPromotionMapper; + + private UserPromotion getUserPromotionByUserId(String userId){ + UserPromotion promotion= userPromotionMapper.selectById(userId); + + if(ObjectUtil.isNotEmpty(promotion)){ + if("MG".equals(promotion.getTypeCode())||"FB".equals(promotion.getTypeCode())|| + "SB".equals(promotion.getTypeCode())||"1".equals(promotion.getIsExtend())){ + return promotion; + } + + + } + getUserPromotionByUserId(promotion.getParentUserId()); + return null; + } }