## Fix - 选择区域 计算自己业绩
This commit is contained in:
parent
bfff613752
commit
bb175563f5
|
@ -16,11 +16,13 @@ import com.hzs.member.account.service.ICuMemberBaseService;
|
||||||
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
|
import com.hzs.member.achieve.service.ICuMemberSettlePeriodService;
|
||||||
import com.hzs.member.base.service.ICuMemberService;
|
import com.hzs.member.base.service.ICuMemberService;
|
||||||
import com.hzs.retail.member.mapper.CuMemberRetailRangeMapper;
|
import com.hzs.retail.member.mapper.CuMemberRetailRangeMapper;
|
||||||
|
import com.hzs.retail.member.param.MarketDynamicsQueryDateParam;
|
||||||
import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
|
import com.hzs.retail.member.service.ICuMemberRetailAchieveService;
|
||||||
import com.hzs.retail.member.utils.DataStatisticsUtil;
|
import com.hzs.retail.member.utils.DataStatisticsUtil;
|
||||||
import com.hzs.retail.member.vo.CuMemberRetailAchieveVO;
|
import com.hzs.retail.member.vo.CuMemberRetailAchieveVO;
|
||||||
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
|
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
|
||||||
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
|
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
|
||||||
|
import com.hzs.retail.member.vo.MarketDynamicsDetailVO;
|
||||||
import com.hzs.system.config.IGradeServiceApi;
|
import com.hzs.system.config.IGradeServiceApi;
|
||||||
import com.hzs.system.config.dto.GradeDTO;
|
import com.hzs.system.config.dto.GradeDTO;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
@ -306,11 +308,17 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
private String getTableName() {
|
private String getTableName() {
|
||||||
String localDate = LocalDate.now().minus(1, ChronoUnit.DAYS).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
String localDate = LocalDate.now().minus(1, ChronoUnit.DAYS).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
||||||
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
|
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
|
||||||
|
if(ObjectUtil.isEmpty(period)){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
|
return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
|
||||||
}
|
}
|
||||||
private String getDayTableName() {
|
private String getDayTableName() {
|
||||||
String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
String localDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
|
||||||
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
|
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
|
||||||
|
if(ObjectUtil.isEmpty(period)){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
return TableNameConstants.CU_MEMBER_RETAIL_S + period;
|
return TableNameConstants.CU_MEMBER_RETAIL_S + period;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -404,12 +412,12 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
List<CuMemberRetailAchieveVO> memberSelfAchieveList = new ArrayList<>();
|
List<CuMemberRetailAchieveVO> memberSelfAchieveList = new ArrayList<>();
|
||||||
|
|
||||||
//会员业绩
|
//会员业绩
|
||||||
// CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build();
|
CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder().memberRetailTable(memberRetailTable).pkMember(pkMember).systemType(systemType).build();
|
||||||
// CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO);
|
CuMemberRetailAchieveVO orderAchieveVO = baseMapper.selectMemberOrderSumAchieveByPkMember(memberAchieveVO);
|
||||||
// if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) {
|
if (null != orderAchieveVO && orderAchieveVO.getArealPv().compareTo(BigDecimal.ZERO) > 0) {
|
||||||
// orderAchieveVO.setPkMember(pkMember);
|
orderAchieveVO.setPkMember(pkMember);
|
||||||
// memberSelfAchieveList.add(orderAchieveVO);
|
memberSelfAchieveList.add(orderAchieveVO);
|
||||||
// }
|
}
|
||||||
//查询伞下业绩
|
//查询伞下业绩
|
||||||
if (CollUtil.isNotEmpty(pkMemberList)) {
|
if (CollUtil.isNotEmpty(pkMemberList)) {
|
||||||
List<CuMemberRetailAchieveVO> memberPushAchieveList = getMemberPushSumAchieve(pkMemberList, memberRetailTable, memberSecondTable, systemType);
|
List<CuMemberRetailAchieveVO> memberPushAchieveList = getMemberPushSumAchieve(pkMemberList, memberRetailTable, memberSecondTable, systemType);
|
||||||
|
@ -577,6 +585,24 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<MarketDynamicsDetailVO> getMarketDynamics(MarketDynamicsQueryDateParam param) {
|
||||||
|
DataStatisticsUtil.setQueryDateParam(param);
|
||||||
|
param.setCurrentDayTableName(getDayTableName());
|
||||||
|
param.setCurrentMonthTableName(getDayTableName(param.getNowDate()));
|
||||||
|
param.setCurrentDayTableName(getDayTableName(param.getLastMonthDate()));
|
||||||
|
log.info("MarketDynamicsQueryDateParam : {}", JSONUtil.toJsonStr(param));
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getDayTableName(String localDate) {
|
||||||
|
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(localDate).getPkId();
|
||||||
|
if(ObjectUtil.isEmpty(period)){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return TableNameConstants.CU_MEMBER_RETAIL_RANGE + period;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询会员是否激活
|
* 查询会员是否激活
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue