Compare commits
No commits in common. "b70912aebb7a14b37a7e0fa64048d3308d5605b9" and "f8c062fb9280a3b4e022077602ddbbdc7937f3b9" have entirely different histories.
b70912aebb
...
f8c062fb92
|
|
@ -65,6 +65,17 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
@DubboReference
|
@DubboReference
|
||||||
ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi;
|
ICuMemberServiceLogServiceApi iCuMemberServiceLogServiceApi;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 特殊体系PK_ID: 150
|
||||||
|
* V4:总 500,小 100
|
||||||
|
* V5:总 2000,小 400
|
||||||
|
*/
|
||||||
|
public static final Long VERTEX_PK_ID = 150L;
|
||||||
|
public static final BigDecimal VERTEX_V4_TOTAL_BOX = new BigDecimal("500");
|
||||||
|
public static final BigDecimal VERTEX_V4_SMALL_BOX = new BigDecimal("100");
|
||||||
|
public static final BigDecimal VERTEX_V5_TOTAL_BOX = new BigDecimal("2000");
|
||||||
|
public static final BigDecimal VERTEX_V5_SMALL_BOX = new BigDecimal("400");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 秒结:
|
* 秒结:
|
||||||
* 实时计算秒结数据(业绩、盒数、等级、奖衔、日奖)
|
* 实时计算秒结数据(业绩、盒数、等级、奖衔、日奖)
|
||||||
|
|
@ -728,16 +739,16 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
// 等级小市场盒数
|
// 等级小市场盒数
|
||||||
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
|
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
|
||||||
|
|
||||||
if (RetailConstants.VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
|
if (VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
|
||||||
// TODO 需要根据配置写死的体系,进行单独处理
|
// TODO 需要根据配置写死的体系,进行单独处理
|
||||||
// V4: 总 500,小 100
|
// V4: 总 500,小 100
|
||||||
// V5: 总 2000,小 400
|
// V5: 总 2000,小 400
|
||||||
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
|
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
|
||||||
boxTotal = RetailConstants.VERTEX_V4_TOTAL_BOX;
|
boxTotal = VERTEX_V4_TOTAL_BOX;
|
||||||
boxSmallTotal = RetailConstants.VERTEX_V4_SMALL_BOX;
|
boxSmallTotal = VERTEX_V4_SMALL_BOX;
|
||||||
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
|
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
|
||||||
boxTotal = RetailConstants.VERTEX_V5_TOTAL_BOX;
|
boxTotal = VERTEX_V5_TOTAL_BOX;
|
||||||
boxSmallTotal = RetailConstants.VERTEX_V5_SMALL_BOX;
|
boxSmallTotal = VERTEX_V5_SMALL_BOX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -977,16 +988,16 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
|
||||||
// 等级小市场盒数
|
// 等级小市场盒数
|
||||||
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
|
BigDecimal boxSmallTotal = bdGrade.getBoxSmallTotal();
|
||||||
|
|
||||||
if (RetailConstants.VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
|
if (VERTEX_PK_ID.equals(targetMemberRangeExt.getPkVertex())) {
|
||||||
// TODO 需要根据配置写死的体系,进行单独处理
|
// TODO 需要根据配置写死的体系,进行单独处理
|
||||||
// V4: 总 500,小 100
|
// V4: 总 500,小 100
|
||||||
// V5: 总 2000,小 400
|
// V5: 总 2000,小 400
|
||||||
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
|
if (EGrade.VIP.getValue() == bdGrade.getGradeValue()) {
|
||||||
boxTotal = RetailConstants.VERTEX_V4_TOTAL_BOX;
|
boxTotal = VERTEX_V4_TOTAL_BOX;
|
||||||
boxSmallTotal = RetailConstants.VERTEX_V4_SMALL_BOX;
|
boxSmallTotal = VERTEX_V4_SMALL_BOX;
|
||||||
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
|
} else if (EGrade.S_VIP.getValue() == bdGrade.getGradeValue()) {
|
||||||
boxTotal = RetailConstants.VERTEX_V5_TOTAL_BOX;
|
boxTotal = VERTEX_V5_TOTAL_BOX;
|
||||||
boxSmallTotal = RetailConstants.VERTEX_V5_SMALL_BOX;
|
boxSmallTotal = VERTEX_V5_SMALL_BOX;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,8 @@ 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.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;
|
||||||
|
|
@ -26,25 +24,23 @@ 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;
|
||||||
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.*;
|
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.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;
|
||||||
import java.math.BigDecimal;
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -64,13 +60,9 @@ 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;
|
||||||
@DubboReference
|
|
||||||
private IGradeServiceApi gradeServiceApi;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取登录会员信息
|
* 获取登录会员信息
|
||||||
|
|
@ -106,11 +98,6 @@ 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) {
|
||||||
// 已自选区域或者已后台指定
|
// 已自选区域或者已后台指定
|
||||||
|
|
@ -135,40 +122,17 @@ 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);
|
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType);
|
||||||
BigDecimal totalBoxNum = result.getTotalBoxNum();
|
log.info("retailAchieve : {}", JSONUtil.toJsonStr(retailAchieve));
|
||||||
BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
|
if(ObjectUtil.isNotEmpty(retailAchieve.getArealPv())
|
||||||
CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
|
&& retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0
|
||||||
if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){
|
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0
|
||||||
// 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()
|
return AjaxResult.success(RetailMemberRegionVO.builder()
|
||||||
.regionStatus(EYesNo.YES.getIntValue())
|
.regionStatus(EYesNo.YES.getIntValue())
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
GradeDTO grade = gradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), pkCountry).getData();
|
|
||||||
if(ObjectUtil.isNotEmpty(totalBoxNum)
|
|
||||||
&& totalBoxNum.compareTo(grade.getBoxTotal()) >= 0
|
|
||||||
&& smallBoxNum.compareTo(grade.getBoxSmallTotal()) >=0
|
|
||||||
){
|
|
||||||
return AjaxResult.success(RetailMemberRegionVO.builder()
|
|
||||||
.regionStatus(EYesNo.YES.getIntValue())
|
|
||||||
.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());
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// 达到条件,但是没有选择区域,需要弹窗选择区域
|
// 达到条件,但是没有选择区域,需要弹窗选择区域
|
||||||
// 验证伞下业绩+自己是否累计30W
|
// 验证伞下业绩+自己是否累计30W
|
||||||
|
|
@ -221,32 +185,12 @@ public class RetailMemberController extends BaseController {
|
||||||
canSet = true;
|
canSet = true;
|
||||||
}
|
}
|
||||||
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
|
if(EYesNo.YES.getIntValue() == cuMemberRetailRegionExt.getIsActivate()){
|
||||||
CuMemberRetailDataStatisticsResultVO result = retailAchieveService.getRetailDataStatisticsDetail(userId, pkCountry, systemType);
|
CuMemberRetailAchieveVO retailAchieve = iCuMemberRetailAchieveService.selectMemberSumAchieve(userId, pkCountry, systemType);
|
||||||
BigDecimal totalBoxNum = result.getTotalBoxNum();
|
if(retailAchieve.getArealPv().compareTo(SysConstants.TOTAL_AREA_PV) >= 0
|
||||||
BigDecimal smallBoxNum = result.getSmallRangeTotalBoxNum();
|
&& retailAchieve.getSmallAreaPv().compareTo(SysConstants.SMALL_AREA_PV) >=0
|
||||||
CuMemberExt memberExt = iCuMemberService.getMemberById(userId);
|
|
||||||
if(memberExt.getPkVertex().equals(RetailConstants.VERTEX_PK_ID)){
|
|
||||||
// BigDecimal bigBoxNum = result.getBigRangeTotalBoxNum();
|
|
||||||
if(ObjectUtil.isNotEmpty(totalBoxNum)
|
|
||||||
&& totalBoxNum.compareTo(RetailConstants.VERTEX_V5_TOTAL_BOX) >= 0
|
|
||||||
&& smallBoxNum.compareTo(RetailConstants.VERTEX_V5_SMALL_BOX) >=0
|
|
||||||
){
|
){
|
||||||
canSet = true;
|
canSet = true;
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
GradeDTO grade = gradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), pkCountry).getData();
|
|
||||||
if(ObjectUtil.isNotEmpty(totalBoxNum)
|
|
||||||
&& totalBoxNum.compareTo(grade.getBoxTotal()) >= 0
|
|
||||||
&& smallBoxNum.compareTo(grade.getBoxSmallTotal()) >=0
|
|
||||||
){
|
|
||||||
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;
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!canSet){
|
if(!canSet){
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import com.hzs.common.core.web.controller.BaseController;
|
||||||
import com.hzs.common.core.web.domain.AjaxResult;
|
import com.hzs.common.core.web.domain.AjaxResult;
|
||||||
import com.hzs.common.core.web.page.TableDataInfo;
|
import com.hzs.common.core.web.page.TableDataInfo;
|
||||||
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
||||||
import com.hzs.common.security.utils.SecurityUtils;
|
|
||||||
import com.hzs.system.config.service.IBdAdvertBannerService;
|
import com.hzs.system.config.service.IBdAdvertBannerService;
|
||||||
import com.hzs.system.config.vo.ApiAdvertBannerVO;
|
import com.hzs.system.config.vo.ApiAdvertBannerVO;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -39,7 +38,7 @@ public class ApiBdAdvertBannerController extends BaseController {
|
||||||
**/
|
**/
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(BdAdvertBanner banner) {
|
public TableDataInfo list(BdAdvertBanner banner) {
|
||||||
List<BdAdvertBanner> list = advertBannerService.listData(banner, SecurityUtils.getUserId());
|
List<BdAdvertBanner> list = advertBannerService.listData(banner);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -53,7 +52,7 @@ public class ApiBdAdvertBannerController extends BaseController {
|
||||||
// 返回结果
|
// 返回结果
|
||||||
List<ApiAdvertBannerVO> resultList = new ArrayList<>();
|
List<ApiAdvertBannerVO> resultList = new ArrayList<>();
|
||||||
|
|
||||||
List<BdAdvertBanner> list = advertBannerService.listData(null, SecurityUtils.getUserId());
|
List<BdAdvertBanner> list = advertBannerService.listData(null);
|
||||||
if (CollectionUtil.isNotEmpty(list)) {
|
if (CollectionUtil.isNotEmpty(list)) {
|
||||||
resultList = BeanUtil.copyToList(list, ApiAdvertBannerVO.class);
|
resultList = BeanUtil.copyToList(list, ApiAdvertBannerVO.class);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -44,21 +44,20 @@ public class BdAdvertBannerController extends BaseController {
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo list(BdAdvertBannerExt advertBannerExt) {
|
public TableDataInfo list(BdAdvertBannerExt advertBannerExt) {
|
||||||
startPage();
|
startPage();
|
||||||
// QueryWrapper<BdAdvertBanner> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<BdAdvertBanner> queryWrapper = new QueryWrapper<>();
|
||||||
// if (StringUtils.isNotNull(advertBannerExt.getPosition())) {
|
if (StringUtils.isNotNull(advertBannerExt.getPosition())) {
|
||||||
// queryWrapper.eq("POSITION", advertBannerExt.getPosition());
|
queryWrapper.eq("POSITION", advertBannerExt.getPosition());
|
||||||
// }
|
}
|
||||||
// if (StringUtils.isNotNull(advertBannerExt.getStartDate())
|
if (StringUtils.isNotNull(advertBannerExt.getStartDate())
|
||||||
// && StringUtils.isNotNull(advertBannerExt.getEndDate())) {
|
&& StringUtils.isNotNull(advertBannerExt.getEndDate())) {
|
||||||
// queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate());
|
queryWrapper.between("CREATION_TIME", advertBannerExt.getStartDate(), advertBannerExt.getEndDate());
|
||||||
// }
|
}
|
||||||
// if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate())
|
if (StringUtils.isNotNull(advertBannerExt.getStartEffectiveDate())
|
||||||
// && StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) {
|
&& StringUtils.isNotNull(advertBannerExt.getEndEffectiveDate())) {
|
||||||
// queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate());
|
queryWrapper.between("EFFECTIVE_DATE", advertBannerExt.getStartEffectiveDate(), advertBannerExt.getEndEffectiveDate());
|
||||||
// }
|
}
|
||||||
// queryWrapper.orderByAsc("SORT");
|
queryWrapper.orderByAsc("SORT");
|
||||||
// List<BdAdvertBanner> list = advertBannerService.list(queryWrapper);
|
List<BdAdvertBanner> list = advertBannerService.list(queryWrapper);
|
||||||
List<BdAdvertBanner> list = advertBannerService.getList(advertBannerExt);
|
|
||||||
if (CollectionUtil.isNotEmpty(list)) {
|
if (CollectionUtil.isNotEmpty(list)) {
|
||||||
for (BdAdvertBanner bdAdvertBanner : list) {
|
for (BdAdvertBanner bdAdvertBanner : list) {
|
||||||
EPositionTwo ePositionTwo = EPositionTwo.getEnumByValue(bdAdvertBanner.getPosition());
|
EPositionTwo ePositionTwo = EPositionTwo.getEnumByValue(bdAdvertBanner.getPosition());
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,6 @@ package com.hzs.system.config.mapper;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
||||||
import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt;
|
|
||||||
import org.apache.ibatis.annotations.Param;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
|
|
@ -17,5 +13,5 @@ import java.util.List;
|
||||||
* @since 2023-04-13
|
* @since 2023-04-13
|
||||||
*/
|
*/
|
||||||
public interface BdAdvertBannerMapper extends BaseMapper<BdAdvertBanner> {
|
public interface BdAdvertBannerMapper extends BaseMapper<BdAdvertBanner> {
|
||||||
List<BdAdvertBanner> getList(@Param("param") BdAdvertBannerExt param);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,6 @@ package com.hzs.system.config.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
||||||
import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -20,9 +19,6 @@ public interface IBdAdvertBannerService extends IService<BdAdvertBanner> {
|
||||||
* @param banner 查询banner
|
* @param banner 查询banner
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
// List<BdAdvertBanner> listData(BdAdvertBanner banner);
|
List<BdAdvertBanner> listData(BdAdvertBanner banner);
|
||||||
|
|
||||||
List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId);
|
|
||||||
|
|
||||||
List<BdAdvertBanner> getList(BdAdvertBannerExt param);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,13 @@
|
||||||
package com.hzs.system.config.service.impl;
|
package com.hzs.system.config.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.util.ObjectUtil;
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.hzs.common.core.constant.CountryConstants;
|
import com.hzs.common.core.constant.CountryConstants;
|
||||||
import com.hzs.common.core.enums.EPositionTwo;
|
import com.hzs.common.core.enums.EPositionTwo;
|
||||||
import com.hzs.common.core.utils.StringUtils;
|
import com.hzs.common.core.utils.StringUtils;
|
||||||
import com.hzs.common.domain.member.base.CuMember;
|
|
||||||
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
import com.hzs.common.domain.system.config.BdAdvertBanner;
|
||||||
import com.hzs.common.domain.system.config.ext.BdAdvertBannerExt;
|
|
||||||
import com.hzs.member.base.IMemberServiceApi;
|
|
||||||
import com.hzs.system.config.mapper.BdAdvertBannerMapper;
|
import com.hzs.system.config.mapper.BdAdvertBannerMapper;
|
||||||
import com.hzs.system.config.service.IBdAdvertBannerService;
|
import com.hzs.system.config.service.IBdAdvertBannerService;
|
||||||
import org.apache.dubbo.config.annotation.DubboReference;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
@ -27,14 +22,12 @@ import java.util.List;
|
||||||
@Service
|
@Service
|
||||||
public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper, BdAdvertBanner> implements IBdAdvertBannerService {
|
public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper, BdAdvertBanner> implements IBdAdvertBannerService {
|
||||||
|
|
||||||
@DubboReference
|
|
||||||
IMemberServiceApi iMemberServiceApi;
|
|
||||||
@Override
|
@Override
|
||||||
public List<BdAdvertBanner> listData(BdAdvertBanner banner, Long userId) {
|
public List<BdAdvertBanner> listData(BdAdvertBanner banner) {
|
||||||
if (null == banner) {
|
if (null == banner) {
|
||||||
banner = new BdAdvertBanner();
|
banner = new BdAdvertBanner();
|
||||||
}
|
}
|
||||||
CuMember cuMember = iMemberServiceApi.getMember(userId).getData();
|
|
||||||
LambdaQueryWrapper<BdAdvertBanner> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BdAdvertBanner> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if (StringUtils.isNotNull(banner.getPosition())) {
|
if (StringUtils.isNotNull(banner.getPosition())) {
|
||||||
queryWrapper.eq(BdAdvertBanner::getPosition, banner.getPosition());
|
queryWrapper.eq(BdAdvertBanner::getPosition, banner.getPosition());
|
||||||
|
|
@ -42,20 +35,10 @@ public class BdAdvertBannerServiceImpl extends ServiceImpl<BdAdvertBannerMapper,
|
||||||
// 默认首页的banner
|
// 默认首页的banner
|
||||||
queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue());
|
queryWrapper.eq(BdAdvertBanner::getPosition, EPositionTwo.POSITION_ONE.getValue());
|
||||||
}
|
}
|
||||||
if(ObjectUtil.isEmpty(cuMember)){
|
|
||||||
queryWrapper.isNull(BdAdvertBanner::getPkVertex);
|
|
||||||
}else{
|
|
||||||
queryWrapper.and(qw -> qw.isNull(BdAdvertBanner::getPkVertex).or().eq(BdAdvertBanner::getPkVertex, cuMember.getPkVertex()));
|
|
||||||
}
|
|
||||||
queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
|
queryWrapper.eq(BdAdvertBanner::getPkCountry, CountryConstants.CHINA_COUNTRY);
|
||||||
queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());
|
queryWrapper.lt(BdAdvertBanner::getEffectiveDate, new Date());
|
||||||
queryWrapper.orderByAsc(BdAdvertBanner::getSort);
|
queryWrapper.orderByAsc(BdAdvertBanner::getSort);
|
||||||
return this.list(queryWrapper);
|
return this.list();
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<BdAdvertBanner> getList(BdAdvertBannerExt param) {
|
|
||||||
return baseMapper.getList(param);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,24 +28,5 @@
|
||||||
PK_MODIFIED,
|
PK_MODIFIED,
|
||||||
PK_ID, POSITION, EFFECTIVE_DATE, SORT, PICTURE, LINK
|
PK_ID, POSITION, EFFECTIVE_DATE, SORT, PICTURE, LINK
|
||||||
</sql>
|
</sql>
|
||||||
<select id="getList" resultType="com.hzs.common.domain.system.config.BdAdvertBanner">
|
|
||||||
select bab.*, bv.VERTEX_NAME as vertexName from BD_ADVERT_BANNER bab
|
|
||||||
left join BD_VERTEX bv on bv.pk_id = bab.PK_VERTEX
|
|
||||||
where 1=1
|
|
||||||
<if test="param.position != null">
|
|
||||||
and bab.position = #{position}
|
|
||||||
</if>
|
|
||||||
<if test="param.startDate != null and param.endDate != null">
|
|
||||||
and bab.CREATION_TIME between #{param.startDate} and #{param.endDate}
|
|
||||||
</if>
|
|
||||||
<if test="param.startEffectiveDate != null and param.endEffectiveDate != null">
|
|
||||||
and bab.effectiveDate between #{param.startEffectiveDate} and #{param.endEffectiveDate}
|
|
||||||
</if>
|
|
||||||
<if test="param.pkVertex != null">
|
|
||||||
and bab.PK_VERTEX = #{param.pkVertex}
|
|
||||||
</if>
|
|
||||||
and bab.del_flag = 0
|
|
||||||
order by bab.sort asc
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
|
||||||
|
|
@ -18,17 +18,6 @@ public class RetailConstants {
|
||||||
*/
|
*/
|
||||||
public static final BigDecimal SAME_RATIO = new BigDecimal("0.005");
|
public static final BigDecimal SAME_RATIO = new BigDecimal("0.005");
|
||||||
|
|
||||||
/**
|
|
||||||
* 特殊体系PK_ID: 150
|
|
||||||
* V4:总 500,小 100
|
|
||||||
* V5:总 2000,小 400
|
|
||||||
*/
|
|
||||||
public static final Long VERTEX_PK_ID = 150L;
|
|
||||||
public static final BigDecimal VERTEX_V4_TOTAL_BOX = new BigDecimal("500");
|
|
||||||
public static final BigDecimal VERTEX_V4_SMALL_BOX = new BigDecimal("100");
|
|
||||||
public static final BigDecimal VERTEX_V5_TOTAL_BOX = new BigDecimal("2000");
|
|
||||||
public static final BigDecimal VERTEX_V5_SMALL_BOX = new BigDecimal("400");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 盒数产品列表
|
* 盒数产品列表
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -72,10 +72,5 @@ public class BdAdvertBanner extends BaseEntity {
|
||||||
@TableField("LINK")
|
@TableField("LINK")
|
||||||
private String link;
|
private String link;
|
||||||
|
|
||||||
@TableField("PK_VERTEX")
|
|
||||||
private Integer pkVertex;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
|
||||||
private String vertexName;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
ALTER TABLE "BD_ADVERT_BANNER"
|
|
||||||
ADD ("PK_VERTEX" NUMBER(6,0));
|
|
||||||
COMMENT ON COLUMN "BD_ADVERT_BANNER"."PK_VERTEX" IS '体系ID';
|
|
||||||
Loading…
Reference in New Issue