diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java index 83efa270..1ac270bc 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java @@ -138,5 +138,5 @@ public interface CuMemberRetailRangeMapper extends BaseMapper getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd); + List getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd, @Param("repurchaseDate") Date repurchaseDate); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java index 6aa9449e..fab1cf29 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java @@ -473,17 +473,19 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl getPerformanceList(PerformanceQueryParam param) { // 1.拼年月 - Date targetDate = null; + Date targetDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); Date targetDayStart = null; Date targetDayEnd = null; CuMemberSettlePeriod settlePeriod = null; if(isCurrentMonth(param.getYear(), param.getMonth())) { - targetDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); targetDayStart = DateUtils.getFirstDayOfMonth(targetDate); targetDayEnd = DateUtils.getLastDayOfMonth(targetDate); settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate)); }else{ settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth()); + if(ObjectUtil.isEmpty(settlePeriod)){ + return Collections.emptyList(); + } targetDayStart = DateUtils.getFirstDayOfMonth(settlePeriod.getSettleDate()); targetDayEnd = DateUtils.getLastDayOfMonth(settlePeriod.getSettleDate()); @@ -520,11 +522,11 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd); + List meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd, targetDate); PageUtils.startPage(param.getPageNum(), param.getPageSize()); List otherList = new ArrayList<>(); if(CollUtil.isNotEmpty(pkMemberList)){ - otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd); + otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd, targetDate); } PageUtils.clearPage(); if(param.getPageNum() == 1){ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml index 1e2a4c4e..3a524c3d 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml @@ -763,7 +763,7 @@ ORDER_TYPE = 43 AND DEL_FLAG = 0 AND ORDER_STATUS = 1 - AND PAY_TIME BETWEEN #{targetDayStart} and #{targetDayEnd} + AND PAY_TIME BETWEEN #{targetDayStart} and #{repurchaseDate} GROUP BY PK_MEMBER ) fg ON fg.pk_member = cu.pk_id