From ccba36e01a7b72ff164d47f422289a69873ae395 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Fri, 1 Aug 2025 13:47:15 +0800 Subject: [PATCH] =?UTF-8?q?##=20Feat=20-=20=E9=9B=A8=E6=B1=90=E5=9B=A2?= =?UTF-8?q?=E9=98=9F=E9=80=89=E5=8F=96=E5=8C=BA=E5=9F=9F=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/RetailMemberController.java | 67 ++++++++++++++----- 1 file changed, 50 insertions(+), 17 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java index c04e5e67..aa5e6733 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java @@ -10,6 +10,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.msg.AreaConstants; 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.ICuMemberRetailRegionService; import com.hzs.retail.member.service.IMemberRetailService; -import com.hzs.retail.member.vo.CuMemberRetailAchieveVO; -import com.hzs.retail.member.vo.RecommendListVO; -import com.hzs.retail.member.vo.RetailMemberInfoVO; -import com.hzs.retail.member.vo.RetailMemberRegionVO; +import com.hzs.retail.member.vo.*; import com.hzs.system.base.IAreaServiceApi; import lombok.extern.slf4j.Slf4j; 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 javax.validation.Valid; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -60,6 +59,8 @@ public class RetailMemberController extends BaseController { private ICuMemberRetailRegionService iCuMemberRetailRegionService; @Autowired private ICuMemberRetailAchieveService iCuMemberRetailAchieveService; + @Autowired + private ICuMemberRetailAchieveService retailAchieveService; @DubboReference IAreaServiceApi iAreaServiceApi; @@ -122,16 +123,32 @@ public class RetailMemberController extends BaseController { .build()); } if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ - 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 - ){ + CuMemberExt memberExt = iCuMemberService.getMemberById(userId); + if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){ + CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType); + 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{ + 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() - .regionStatus(EYesNo.YES.getIntValue()) - .build()); + return AjaxResult.success(RetailMemberRegionVO.builder() + .regionStatus(EYesNo.YES.getIntValue()) + .build()); + } } } // 达到条件，但是没有选择区域，需要弹窗选择区域 @@ -186,10 +203,26 @@ public class RetailMemberController extends BaseController { } if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); - if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 - && retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0 - ){ - canSet = true; + CuMemberExt memberExt = iCuMemberService.getMemberById(userId); + if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){ + CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType); + 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; + } } } }