forked from angelo/java-retail-app
## Opt - 业绩列表-复购取昨天
This commit is contained in:
parent
878e551cac
commit
081cb4e740
|
@ -138,5 +138,5 @@ public interface CuMemberRetailRangeMapper extends BaseMapper<CuMemberRetailRang
|
||||||
* @param targetDayEnd
|
* @param targetDayEnd
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<PerformanceVO> getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List<Long> memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd);
|
List<PerformanceVO> getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List<Long> memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd, @Param("repurchaseDate") Date repurchaseDate);
|
||||||
}
|
}
|
||||||
|
|
|
@ -473,17 +473,19 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
@Override
|
@Override
|
||||||
public List<PerformanceVO> getPerformanceList(PerformanceQueryParam param) {
|
public List<PerformanceVO> getPerformanceList(PerformanceQueryParam param) {
|
||||||
// 1.拼年月
|
// 1.拼年月
|
||||||
Date targetDate = null;
|
Date targetDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
|
||||||
Date targetDayStart = null;
|
Date targetDayStart = null;
|
||||||
Date targetDayEnd = null;
|
Date targetDayEnd = null;
|
||||||
CuMemberSettlePeriod settlePeriod = null;
|
CuMemberSettlePeriod settlePeriod = null;
|
||||||
if(isCurrentMonth(param.getYear(), param.getMonth())) {
|
if(isCurrentMonth(param.getYear(), param.getMonth())) {
|
||||||
targetDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
|
|
||||||
targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
|
targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
|
||||||
targetDayEnd = DateUtils.getLastDayOfMonth(targetDate);
|
targetDayEnd = DateUtils.getLastDayOfMonth(targetDate);
|
||||||
settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
|
settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
|
||||||
}else{
|
}else{
|
||||||
settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
|
settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
|
||||||
|
if(ObjectUtil.isEmpty(settlePeriod)){
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
targetDayStart = DateUtils.getFirstDayOfMonth(settlePeriod.getSettleDate());
|
targetDayStart = DateUtils.getFirstDayOfMonth(settlePeriod.getSettleDate());
|
||||||
targetDayEnd = DateUtils.getLastDayOfMonth(settlePeriod.getSettleDate());
|
targetDayEnd = DateUtils.getLastDayOfMonth(settlePeriod.getSettleDate());
|
||||||
|
|
||||||
|
@ -520,11 +522,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
){
|
){
|
||||||
pkMemberList = baseMapper.selectDirectPushByPkMember(member.getPkId(), SecurityUtils.getSystemType());
|
pkMemberList = baseMapper.selectDirectPushByPkMember(member.getPkId(), SecurityUtils.getSystemType());
|
||||||
}
|
}
|
||||||
List<PerformanceVO> meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd);
|
List<PerformanceVO> meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd, targetDate);
|
||||||
PageUtils.startPage(param.getPageNum(), param.getPageSize());
|
PageUtils.startPage(param.getPageNum(), param.getPageSize());
|
||||||
List<PerformanceVO> otherList = new ArrayList<>();
|
List<PerformanceVO> otherList = new ArrayList<>();
|
||||||
if(CollUtil.isNotEmpty(pkMemberList)){
|
if(CollUtil.isNotEmpty(pkMemberList)){
|
||||||
otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd);
|
otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd, targetDate);
|
||||||
}
|
}
|
||||||
PageUtils.clearPage();
|
PageUtils.clearPage();
|
||||||
if(param.getPageNum() == 1){
|
if(param.getPageNum() == 1){
|
||||||
|
|
|
@ -763,7 +763,7 @@
|
||||||
ORDER_TYPE = 43
|
ORDER_TYPE = 43
|
||||||
AND DEL_FLAG = 0
|
AND DEL_FLAG = 0
|
||||||
AND ORDER_STATUS = 1
|
AND ORDER_STATUS = 1
|
||||||
AND PAY_TIME BETWEEN #{targetDayStart} and #{targetDayEnd}
|
AND PAY_TIME BETWEEN #{targetDayStart} and #{repurchaseDate}
|
||||||
GROUP BY
|
GROUP BY
|
||||||
PK_MEMBER
|
PK_MEMBER
|
||||||
) fg ON fg.pk_member = cu.pk_id
|
) fg ON fg.pk_member = cu.pk_id
|
||||||
|
|
Loading…
Reference in New Issue