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 1ac270bc..83efa270 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, @Param("repurchaseDate") Date repurchaseDate); + List getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd); } 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 fab1cf29..3f622c48 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 @@ -479,7 +479,8 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd, targetDate); + List meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd); PageUtils.startPage(param.getPageNum(), param.getPageSize()); List otherList = new ArrayList<>(); if(CollUtil.isNotEmpty(pkMemberList)){ - otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd, targetDate); + otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd); } 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 3a524c3d..1e2a4c4e 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 #{repurchaseDate} + AND PAY_TIME BETWEEN #{targetDayStart} and #{targetDayEnd} GROUP BY PK_MEMBER ) fg ON fg.pk_member = cu.pk_id diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java index ee43274e..495c0b7b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java @@ -918,4 +918,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { return daysStrList; } + public static Date getEndOfDay(Date date) { + LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); + LocalDateTime endOfDay = localDateTime.withHour(23).withMinute(59).withSecond(59).withNano(999999999); + return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()); + } + }