From f0e036aefca91cf7e93b940723c96d0017b9e1db Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Fri, 1 Aug 2025 14:50:24 +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 --- .../controller/api/RetailMemberController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 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; }