From 5e0fecd8b97cdd6e960b68ad5b21602cb3ccd75c Mon Sep 17 00:00:00 2001 From: zhangheng Date: Sun, 28 Sep 2025 17:23:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=9E=B6=E6=9E=84=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9,?= =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9=E6=8E=92=E5=BA=8F,=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E5=AD=90=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiMemberController.java | 9 ++-- .../controller/manage/CuMemberController.java | 10 ++-- .../base/mapper/CuMemberRetailMapper.java | 4 +- .../base/service/ICuMemberRetailService.java | 4 +- .../impl/CuMemberRetailServiceImpl.java | 8 +-- .../ICumemberRetailDetailServiceImpl.java | 5 +- .../com/hzs/member/base/vo/MemberPointVO.java | 13 +++++ .../member/base/CuMemberRetailMapper.xml | 52 +++++++++++++------ .../member/CuMemberRetailDetailMapper.xml | 2 + .../common/domain/system/config/BdAwards.java | 37 ++++++------- 10 files changed, 86 insertions(+), 58 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 2804cded..f93a946e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -458,18 +458,15 @@ public class ApiMemberController extends BaseController { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(yesterday); log.info("会员结算表信息{}",csPeriod); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); - log.info("会员结算表名称{}",settleTableName); + String settleDetailTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId(); + log.info("会员结算表名称{}{}",settleTableName,settleDetailTableName); // 校验当前日结表是否存在 Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); return AjaxResult.error("数据查询错误,请联系客服处理"); } - List list = iCuMemberRetailService.getMemberPointByUserId(settleTableName,userId); - if (CollectionUtil.isEmpty(list)) { - return AjaxResult.success(); - } - MemberPointVO memberPointVO = list.get(0); + MemberPointVO memberPointVO = iCuMemberRetailService.getMemberPointByUserId(settleDetailTableName,settleTableName,userId); memberPointVO.setMemberSettlePeriod(csPeriod.getSettleDate()); startPage(); return AjaxResult.success(memberPointVO); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index abeabc42..d5aebd27 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -805,14 +805,15 @@ public class CuMemberController extends BaseController { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("会员结算表信息{}",csPeriod); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); - log.info("会员结算表名称{}",settleTableName); + String settleDetailTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId(); + log.info("会员结算表名称{}{}",settleTableName,settleDetailTableName); // 校验当前日结表是否存在 Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); return AjaxResult.error("当前会员日结表信息不存在"); } - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleDetailTableName,settleTableName,memberCode,sort,sortColumn); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); @@ -830,8 +831,9 @@ public class CuMemberController extends BaseController { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(param.getMemberSettlePeriodId()); log.info("会员结算表信息{}",csPeriod); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); - log.info("会员结算表名称{}",settleTableName); - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getSortColumn()); + String settleDetailTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE_DETAIL + csPeriod.getPkId(); + log.info("会员结算表名称{}{}",settleTableName,settleDetailTableName); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleDetailTableName, settleTableName, param.getMemberCode(), param.getSort(), param.getSortColumn()); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java index 731751c1..26e6b25c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java @@ -20,7 +20,7 @@ public interface CuMemberRetailMapper extends BaseMapper { Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName); - List getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode, @Param("sort") String sort, @Param("sortColumn") String sortColumn); + List getMemberPointByMemberCode(@Param("settleDetailTableName") String settleDetailTableName,@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode, @Param("sort") String sort, @Param("sortColumn") String sortColumn); - List getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId); + MemberPointVO getMemberPointByUserId(@Param("settleDetailTableName") String settleDetailTableName,@Param("settleTableName") String settleTableName, @Param("userId") Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java index c69e6f38..4ced2404 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java @@ -17,7 +17,7 @@ public interface ICuMemberRetailService{ Integer getFindCuMemberRetailDetail(String settleTableName); - List getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn); + List getMemberPointByMemberCode(String settleDetailTableName,String settleTableName, String memberCode, String sort, String sortColumn); - List getMemberPointByUserId(String settleTableName, Long userId); + MemberPointVO getMemberPointByUserId(String settleDetailTableName,String settleTableName, Long userId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java index 477e39ff..f1a5c5bd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java @@ -26,12 +26,12 @@ public class CuMemberRetailServiceImpl extends ServiceImpl getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) { - return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); + public List getMemberPointByMemberCode(String settleDetailTableName, String settleTableName, String memberCode, String sort, String sortColumn) { + return baseMapper.getMemberPointByMemberCode(settleDetailTableName,settleTableName,memberCode,sort,sortColumn); } @Override - public List getMemberPointByUserId(String settleTableName, Long userId) { - return baseMapper.getMemberPointByUserId(settleTableName,userId); + public MemberPointVO getMemberPointByUserId(String settleDetailTableName,String settleTableName, Long userId) { + return baseMapper.getMemberPointByUserId(settleDetailTableName,settleTableName,userId); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java index 854026ee..fc3f0aad 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java @@ -99,6 +99,7 @@ public class ICumemberRetailDetailServiceImpl extends ServiceImpl diff --git a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml index 2611ea8d..bd1db8e3 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml @@ -14,6 +14,7 @@ and cud.STAGE_STATUS = #{stageStatus} + ORDER BY CHILD_NODE ASC