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

Compare commits

base: angelo:3e6c3f0c0a19e96e468300139f2c050c7bb153b5
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master
..
compare: angelo/java-store-retail-app:da35abc4f8831b793ecb3a6daede826bb25c58be
Branches Tags
angelo/java-store-retail-app:online
angelo/java-store-retail-app:test
angelo/java-store-retail-app:dev
angelo/java-store-retail-app:master
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master

No commits in common. "3e6c3f0c0a19e96e468300139f2c050c7bb153b5" and "da35abc4f8831b793ecb3a6daede826bb25c58be" have entirely different histories.
3e6c3f0c0a ... da35abc4f8

3 changed files with 6 additions and 8 deletions
Show Stats 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);
} }

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

@ -473,19 +473,17 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
@Override @Override
public List<PerformanceVO> getPerformanceList(PerformanceQueryParam param) { public List<PerformanceVO> getPerformanceList(PerformanceQueryParam param) {
// 1.拼年月 // 1.拼年月
Date targetDate = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()); Date targetDate = null;
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());
@ -522,11 +520,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