diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java index 361eddf4..39e168c0 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/api/ApiCuMemberBonusController.java @@ -39,18 +39,18 @@ public class ApiCuMemberBonusController extends BaseController { public TableDataInfo listFirstRepurchaseBonus(@RequestBody BonusParam bonusParam) { setBonusParam(bonusParam); - // 当前日期的天 - int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate())); - if (dateDD < 15) { - // 今天日期小于15号,查询上月23号之前的 - bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23)); - } else { - // 今天日期大于等于15号,查询本月7号之前的 - bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7)); - } - - // 新查询奖金明细 - List cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam); +// // 当前日期的天 +// int dateDD = Integer.parseInt(DateUtils.parseDateTimeToStr(DateUtils.DD, bonusParam.getEndDate())); +// if (dateDD < 15) { +// // 今天日期小于15号,查询上月23号之前的 +// bonusParam.setEndDate(DateUtils.setDays(DateUtils.addMonths(bonusParam.getEndDate(), -1), 23)); +// } else { +// // 今天日期大于等于15号,查询本月7号之前的 +// bonusParam.setEndDate(DateUtils.setDays(bonusParam.getEndDate(), 7)); +// } +// // 新查询奖金明细 +// List cuMemberBonusList = iCuMemberBonusService.listMemberBonus(bonusParam); + List cuMemberBonusList = iCuMemberBonusService.queryMemberBonusVoByCondition(bonusParam); List firstPurchaseVOList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { @@ -96,7 +96,7 @@ public class ApiCuMemberBonusController extends BaseController { bonusParam.setPkMember(SecurityUtils.getUserId()); // 默认查询90天之内的 - Date startDate = DateUtils.beforeDate(60, ChronoUnit.DAYS, DateUtils.currentDate()); + Date startDate = DateUtils.beforeDate(15, ChronoUnit.DAYS, DateUtils.currentDate()); if (bonusParam.getStartDate() == null) { bonusParam.setStartDate(startDate); } else if (DateUtils.compareDateBefore(bonusParam.getStartDate(), startDate)) { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 19c7e8ec..c452f08b 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -90,10 +90,12 @@ public class CuMemberBonusServiceImpl extends ServiceImpl