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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-08-01 16:38:43 +08:00
parent 75a1b222c9 96d0cab579
commit c6c3ebe92b
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.RetailConstants;
@ -25,6 +26,7 @@ import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.retail.member.CuMemberRetailRegion; import com.hzs.common.domain.retail.member.CuMemberRetailRegion;
import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt; import com.hzs.common.domain.retail.member.ext.CuMemberRetailRegionExt;
import com.hzs.common.domain.system.base.BdArea; import com.hzs.common.domain.system.base.BdArea;
import com.hzs.common.domain.system.config.BdGrade;
import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.service.ICuMemberService;
import com.hzs.retail.member.param.RetailMemberRegionParam; import com.hzs.retail.member.param.RetailMemberRegionParam;
@ -33,9 +35,12 @@ 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.*; import com.hzs.retail.member.vo.*;
import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.base.IAreaServiceApi;
import com.hzs.system.config.IGradeServiceApi;
import com.hzs.system.config.dto.GradeDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
@ -64,6 +69,8 @@ public class RetailMemberController extends BaseController {
@DubboReference @DubboReference
IAreaServiceApi iAreaServiceApi; IAreaServiceApi iAreaServiceApi;
@DubboReference
private IGradeServiceApi gradeServiceApi;
/** /**
* 获取登录会员信息 * 获取登录会员信息
@ -99,6 +106,11 @@ public class RetailMemberController extends BaseController {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
CuMemberRetailRegionExt cuMemberRetailRegionExt = iCuMemberRetailRegionService.getRegionByMember(userId, EGrade.S_VIP.getValue(), systemType); CuMemberRetailRegionExt cuMemberRetailRegionExt = iCuMemberRetailRegionService.getRegionByMember(userId, EGrade.S_VIP.getValue(), systemType);
LambdaQueryWrapper<CuMemberRetailRegion> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CuMemberRetailRegion::getPkMember, userId);
int countNum = iCuMemberRetailRegionService.count(queryWrapper);
boolean isFirst = countNum > 0;
log.info("cuMemberRetailRegionExt -> {}", JSONUtil.toJsonStr(cuMemberRetailRegionExt)); log.info("cuMemberRetailRegionExt -> {}", JSONUtil.toJsonStr(cuMemberRetailRegionExt));
if (null != cuMemberRetailRegionExt) { if (null != cuMemberRetailRegionExt) {
// 已自选区域或者已后台指定 // 已自选区域或者已后台指定
@ -123,11 +135,11 @@ public class RetailMemberController extends BaseController {
.build()); .build());
} }
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType);
BigDecimal totalBoxNum = result.getTotalBoxNum();
BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
CuMemberExt memberExt = iCuMemberService.getMemberById(userId); CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){ 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(); // BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
if(ObjectUtil.isNotEmpty(totalBoxNum) if(ObjectUtil.isNotEmpty(totalBoxNum)
&& totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0 && totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0
@ -138,17 +150,24 @@ public class RetailMemberController extends BaseController {
.build()); .build());
} }
}else{ }else{
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); GradeDTO grade = gradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), pkCountry).getData();
log.info("retailAchieve : {}", JSONUtil.toJsonStr(retailAchieve)); if(ObjectUtil.isNotEmpty(totalBoxNum)
if(ObjectUtil.isNotEmpty(retailAchieve.getArealPv()) && totalBoxNum.compareTo(grade.getBoxTotal()) >= 0
&& retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 && smallBoxNum.compareTo(grade.getBoxSmallTotal()) >=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());
} }
// if(ObjectUtil.isNotEmpty(retailAchieve.getArealPv())
// && 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()
// .regionStatus(EYesNo.YES.getIntValue())
// .build());
// }
} }
} }
// 达到条件，但是没有选择区域，需要弹窗选择区域 // 达到条件，但是没有选择区域，需要弹窗选择区域
@ -202,12 +221,11 @@ public class RetailMemberController extends BaseController {
canSet = true; canSet = true;
} }
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){ if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType); CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType);
BigDecimal totalBoxNum = result.getTotalBoxNum();
BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
CuMemberExt memberExt = iCuMemberService.getMemberById(userId); CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){ 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(); // BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
if(ObjectUtil.isNotEmpty(totalBoxNum) if(ObjectUtil.isNotEmpty(totalBoxNum)
&& totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0 && totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0
@ -216,11 +234,18 @@ public class RetailMemberController extends BaseController {
canSet = true; canSet = true;
} }
}else{ }else{
if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0 GradeDTO grade = gradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), pkCountry).getData();
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0 if(ObjectUtil.isNotEmpty(totalBoxNum)
&& totalBoxNum.compareTo(grade.getBoxTotal()) >= 0
&& smallBoxNum.compareTo(grade.getBoxSmallTotal()) >=0
){ ){
canSet = true; canSet = true;
} }
// 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;
// }
} }
} }
} }