diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java index 3c2bce57..45909763 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java @@ -43,6 +43,8 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; /** @@ -110,8 +112,9 @@ public class MemberStructureController extends BaseController { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); } else { - // 没有传入期数,按当前时间取期数 - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + // 没有传入期数,按当前时间-1取期数 + String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday); if (csPeriod != null) { period = csPeriod.getPkId(); settleDate = csPeriod.getSettleDate(); @@ -121,7 +124,9 @@ public class MemberStructureController extends BaseController { if (settleDate != null && DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, settleDate).equals(DateUtils.parseDateToFormat(DateUtils.YYYY_MM_DD, new Date()))) { // 查询当天 (秒结) // 会员秒结表 - String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_S + period; + String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday); + String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); // 校验秒结表是否存在 Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName); if (tableNumber != null && tableNumber == 1) { @@ -135,7 +140,7 @@ public class MemberStructureController extends BaseController { // 秒结表不存在,取昨天的结算表 DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (csPeriod != null) { period = csPeriod.getPkId(); } @@ -174,13 +179,7 @@ public class MemberStructureController extends BaseController { return AjaxResult.success(iCuMemberService.systemListTree(memberRetailExtList, cuMemberSettleExt, settleTableName)); } } else { - DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); - time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); - if (csPeriod != null) { - period = csPeriod.getPkId(); - } - // 查询 历史 + // 不是当天,查询传入日结信息 String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + period; Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);