angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Feat - 雨汐团队选取区域特殊逻辑

This commit is contained in:
sangelxiu1 2025-08-01 13:47:15 +08:00 committed by cabbage
parent a7979f93ea
commit ccba36e01a
1 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
View File

@ -10,6 +10,7 @@ import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.constant.RetailConstants;
import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.constant.SysConstants;
import com.hzs.common.core.constant.msg.AreaConstants; import com.hzs.common.core.constant.msg.AreaConstants;
import com.hzs.common.core.enums.EGrade; import com.hzs.common.core.enums.EGrade;
@ -30,10 +31,7 @@ import com.hzs.retail.member.param.RetailMemberRegionParam;
import com.hzs.retail.member.service.ICuMemberRetailAchieveService; import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
import com.hzs.retail.member.service.ICuMemberRetailRegionService; import com.hzs.retail.member.service.ICuMemberRetailRegionService;
import com.hzs.retail.member.service.IMemberRetailService; import com.hzs.retail.member.service.IMemberRetailService;
import com.hzs.retail.member.vo.CuMemberRetailAchieveVO; import com.hzs.retail.member.vo.*;
import com.hzs.retail.member.vo.RecommendListVO;
import com.hzs.retail.member.vo.RetailMemberInfoVO;
import com.hzs.retail.member.vo.RetailMemberRegionVO;
import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.base.IAreaServiceApi;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
@ -41,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -60,6 +59,8 @@ public class RetailMemberController extends BaseController {
private ICuMemberRetailRegionService iCuMemberRetailRegionService; private ICuMemberRetailRegionService iCuMemberRetailRegionService;
@Autowired @Autowired
private ICuMemberRetailAchieveService iCuMemberRetailAchieveService; private ICuMemberRetailAchieveService iCuMemberRetailAchieveService;
@Autowired
private ICuMemberRetailAchieveService retailAchieveService;
@DubboReference @DubboReference
IAreaServiceApi iAreaServiceApi; IAreaServiceApi iAreaServiceApi;
@ -122,16 +123,32 @@ public class RetailMemberController extends BaseController {
.build()); .build());
} }
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
log.info("retailAchieve : {}", JSONUtil.toJsonStr(retailAchieve)); if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){
if(ObjectUtil.isNotEmpty(retailAchieve.getArealPv()) CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType);
&& retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 BigDecimal totalBoxNum = result.getTotalBoxNum();
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0 BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
){ // BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
if(ObjectUtil.isNotEmpty(totalBoxNum)
&& totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0
&& smallBoxNum.compareTo(RetailConstants.VERTEX_V5_SMALL_BOX) >=0
){
return AjaxResult.success(RetailMemberRegionVO.builder()
.regionStatus(EYesNo.YES.getIntValue())
.build());
}
}else{
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType);
log.info("retailAchieve : {}", JSONUtil.toJsonStr(retailAchieve));
if(ObjectUtil.isNotEmpty(retailAchieve.getArealPv())
&& retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0
){
return AjaxResult.success(RetailMemberRegionVO.builder() return AjaxResult.success(RetailMemberRegionVO.builder()
.regionStatus(EYesNo.YES.getIntValue()) .regionStatus(EYesNo.YES.getIntValue())
.build()); .build());
}
} }
} }
// 达到条件，但是没有选择区域，需要弹窗选择区域 // 达到条件，但是没有选择区域，需要弹窗选择区域
@ -186,10 +203,26 @@ public class RetailMemberController extends BaseController {
} }
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType);
if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0 if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){
){ CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType);
canSet = true; BigDecimal totalBoxNum = result.getTotalBoxNum();
BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
// BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
if(ObjectUtil.isNotEmpty(totalBoxNum)
&& totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0
&& smallBoxNum.compareTo(RetailConstants.VERTEX_V5_SMALL_BOX) >=0
){
return AjaxResult.success(RetailMemberRegionVO.builder()
.regionStatus(EYesNo.YES.getIntValue())
.build());
}
}else{
if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0
){
canSet = true;
}
} }
} }
} }