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

## 奖金明细改为按日显示；

This commit is contained in:
cabbage 2025-09-01 11:00:59 +08:00
parent da97a137be
commit c515f7e476
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java
View File

@ -39,18 +39,18 @@ public class ApiCuMemberBonusController extends BaseController {
public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) { public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) {
setBonusParam(bonusParam); setBonusParam(bonusParam);
// 当前日期的天 // // 当前日期的天
int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate())); // int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate()));
if (dateDD < 15) { // if (dateDD < 15) {
// 今天日期小于15号，查询上月23号之前的 // // 今天日期小于15号，查询上月23号之前的
bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23)); // bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23));
} else { // } else {
// 今天日期大于等于15号，查询本月7号之前的 // // 今天日期大于等于15号，查询本月7号之前的
bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7)); // bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7));
} // }
// // 新查询奖金明细
// 新查询奖金明细 // List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam);
List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam); List<CuMemberBonusExt> cuMemberBonusList = iCuMemberBonusService.queryMemberBonusVoByCondition(bonusParam);
List<MemberBonusFirstPurchaseVO> firstPurchaseVOList = new ArrayList<>(); List<MemberBonusFirstPurchaseVO> firstPurchaseVOList = new ArrayList<>();
cuMemberBonusList.forEach(cuMemberBonus -> { cuMemberBonusList.forEach(cuMemberBonus -> {
@ -96,7 +96,7 @@ public class ApiCuMemberBonusController extends BaseController {
bonusParam.setPkMember(SecurityUtils.getUserId()); bonusParam.setPkMember(SecurityUtils.getUserId());
// 默认查询90天之内的 // 默认查询90天之内的
Date startDate = DateUtils.beforeDate(60, ChronoUnit.DAYS, DateUtils.currentDate()); Date startDate = DateUtils.beforeDate(15, ChronoUnit.DAYS, DateUtils.currentDate());
if (bonusParam.getStartDate() == null) { if (bonusParam.getStartDate() == null) {
bonusParam.setStartDate(startDate); bonusParam.setStartDate(startDate);
} else if (DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)) { } else if (DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)) {

2
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
View File

@ -90,10 +90,12 @@ public class CuMemberBonusServiceImpl extends ServiceImpl<CuMemberBonusMapper, C
if (!DateUtils.compareDateEqual(endDate, DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate())) if (!DateUtils.compareDateEqual(endDate, DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate()))
|| DateUtils.compareDateTimeAfter(DateUtils.currentDateTime(), compareDate)) { || DateUtils.compareDateTimeAfter(DateUtils.currentDateTime(), compareDate)) {
CuMemberBonusExt cuMemberBonusExt = new CuMemberBonusExt(); CuMemberBonusExt cuMemberBonusExt = new CuMemberBonusExt();
cuMemberBonusExt.setSettleDate(endDate);
cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO); cuMemberBonusExt.setRepurRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO); cuMemberBonusExt.setRetailRangeIncome(BigDecimal.ZERO);
cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO); cuMemberBonusExt.setRetailRealSubtotal(BigDecimal.ZERO);
cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO); cuMemberBonusExt.setRealIncomeTotal(BigDecimal.ZERO);
cuMemberBonusExt.setRetailAreaIncome(BigDecimal.ZERO);
memberBonusExtList.add(cuMemberBonusExt); memberBonusExtList.add(cuMemberBonusExt);
} }
} }