From cef149218034349e59be0b846a69cab43eccafd7 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 24 Sep 2025 13:36:12 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8E=A8=E8=8D=90=E6=9E=B6=E6=9E=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E6=97=A5=E7=BB=93=E4=BF=A1=E6=81=AF(?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E6=9F=A5=E8=AF=A2=E4=B8=8A=E4=B8=80=E5=A4=A9?= =?UTF-8?q?=E6=97=A5=E7=BB=93=E4=BF=A1=E6=81=AF)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/MemberStructureController.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) 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);