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 5999dcf1..ace06319 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 @@ -124,8 +124,8 @@ public class RetailMemberController extends BaseController { } if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ CuMemberExt memberExt = iCuMemberService.getMemberById(userId); + CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType); 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(); @@ -141,8 +141,8 @@ public class RetailMemberController extends BaseController { 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 + && result.getTotalPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.TOTAL_AREA_PV) >= 0 + && result.getSmallRangeTotalPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) >=0 ){ return AjaxResult.success(RetailMemberRegionVO.builder() @@ -203,9 +203,9 @@ public class RetailMemberController extends BaseController { } if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); + CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType); 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(); @@ -216,8 +216,8 @@ public class RetailMemberController extends BaseController { canSet = true; } }else{ - if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 - && retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0 + if(result.getTotalPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.TOTAL_AREA_PV) >= 0 + && result.getSmallRangeTotalPv().multiply(new BigDecimal("10000")).compareTo(SysConstants.SMALL_AREA_PV) >=0 ){ canSet = true; }