angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-09-04 09:25:27 +08:00
parent 841efef189 714dd440d6
commit 4d40a7cc19
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/mapper/CuMemberRetailRangeMapper.java
View File

@ -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, @Param("repurchaseDate") Date repurchaseDate); List<PerformanceVO> getPerformanceList(@Param("tableName") String tableName, @Param("memberIdList") List<Long> memberIdList, @Param("targetDayStart") Date targetDayStart, @Param("targetDayEnd") Date targetDayEnd);
} }

7
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
View File

@ -479,7 +479,8 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
CuMemberSettlePeriod settlePeriod = null; CuMemberSettlePeriod settlePeriod = null;
if(isCurrentMonth(param.getYear(), param.getMonth())) { if(isCurrentMonth(param.getYear(), param.getMonth())) {
targetDayStart = DateUtils.getFirstDayOfMonth(targetDate); targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
targetDayEnd = DateUtils.getLastDayOfMonth(targetDate); targetDayEnd = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
targetDayEnd = DateUtils.getEndOfDay(targetDayEnd);
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());
@ -522,11 +523,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, targetDate); List<PerformanceVO> meList = baseMapper.getPerformanceList(settleTable, Collections.singletonList(member.getPkId()), targetDayStart, targetDayEnd);
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, targetDate); otherList = baseMapper.getPerformanceList(settleTable, pkMemberList, targetDayStart, targetDayEnd);
} }
PageUtils.clearPage(); PageUtils.clearPage();
if(param.getPageNum() == 1){ if(param.getPageNum() == 1){

2
bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberRetailRangeMapper.xml
View File

@ -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 #{repurchaseDate} AND PAY_TIME BETWEEN #{targetDayStart} and #{targetDayEnd}
GROUP BY GROUP BY
PK_MEMBER PK_MEMBER
) fg ON fg.pk_member = cu.pk_id ) fg ON fg.pk_member = cu.pk_id

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java
View File

@ -918,4 +918,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return daysStrList; 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());
}
} }