From c043848958acdfb55969d46eeafc74e092c5fbbc Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 21 Oct 2025 09:42:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E5=AD=90=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/controller/manage/CuMemberController.java | 6 ++---- .../controller/api/ApiMemberStructureController.java | 8 +++----- .../controller/manage/MemberStructureController.java | 6 ++---- 3 files changed, 7 insertions(+), 13 deletions(-) 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 d5aebd27..78b2ed9f 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 @@ -797,10 +797,9 @@ public class CuMemberController extends BaseController { */ @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT) @GetMapping("/member-point") - public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) { + public TableDataInfo memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) { if (memberSettlePeriodId == null) { log.error("参数错误{}", memberSettlePeriodId); - return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("会员结算表信息{}",csPeriod); @@ -811,14 +810,13 @@ public class CuMemberController extends BaseController { Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); - return AjaxResult.error("当前会员日结表信息不存在"); } List list = iCuMemberRetailService.getMemberPointByMemberCode(settleDetailTableName,settleTableName,memberCode,sort,sortColumn); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); startPage(); - return AjaxResult.success(getDataTable(list)); + return getDataTable(list); } /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java index 008e6ad2..344287ac 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java @@ -5,6 +5,7 @@ import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.*; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.enums.*; +import com.hzs.common.core.utils.ExceptionUtil; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; @@ -121,15 +122,13 @@ public class ApiMemberStructureController extends BaseController { @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @GetMapping("/three-framework-list") - public AjaxResult threeFrameworkList(Integer stage, Integer stageStatus) { + public TableDataInfo threeFrameworkList(Integer stage, Integer stageStatus) { if (stage == null) { log.error("参数错误"); - return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } Long userId = SecurityUtils.getUserId(); if (userId == null) { log.error("用户登录信息错误"); - return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } // 获取当前时间 -1 天 String yesterday = LocalDate.now().minusDays(1).format((DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -142,13 +141,12 @@ public class ApiMemberStructureController extends BaseController { Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前会员日结信息不存在{}",settleTableName); - return AjaxResult.error(); } startPage(); // 查询当前会员所有子点位信息 CuMember member = iCuMemberService.getMember(userId); List cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus); - return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS)); + return getDataTable(cuMemberThreeFrameworkVOS); } @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) 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 92505327..6149264c 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 @@ -255,10 +255,9 @@ public class MemberStructureController extends BaseController { */ @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) @GetMapping("/three-framework-list") - public AjaxResult threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) { + public TableDataInfo threeFrameworkList(Long memberSettlePeriodId, String memberCode, Integer stage, Integer stageStatus) { if (memberSettlePeriodId == null || memberCode == null || stage == null) { log.error("参数错误"); - return AjaxResult.error(CommonMsgConstants.MISSING_PARAM); } CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("日结信息{}",csPeriod); @@ -268,12 +267,11 @@ public class MemberStructureController extends BaseController { Integer isFind = iCumemberRetailDetailService.getFindCumemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); - return AjaxResult.error(); } startPage(); // 查询当前会员所有子点位信息 List cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,memberCode,stage,stageStatus); - return AjaxResult.success(getDataTable(cuMemberThreeFrameworkVOS)); + return getDataTable(cuMemberThreeFrameworkVOS); } @Log(module = EOperationModule.MEMBER_RETAIL_TREE_LIST, business = EOperationBusiness.MEMBER_RETAIL_TREE_LIST, method = EOperationMethod.SELECT) From 88efae95d5d0c6d894d5ed6412ed02bd21d4458a Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 21 Oct 2025 11:05:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E5=AD=90=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/base/controller/manage/CuMemberController.java | 2 +- .../src/main/java/com/hzs/member/base/vo/MemberPointVO.java | 4 +++- .../controller/api/ApiMemberStructureController.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 78b2ed9f..525e5960 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 @@ -811,11 +811,11 @@ public class CuMemberController extends BaseController { if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); } + startPage(); List list = iCuMemberRetailService.getMemberPointByMemberCode(settleDetailTableName,settleTableName,memberCode,sort,sortColumn); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); - startPage(); return getDataTable(list); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java index c77a6603..502eedbc 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/MemberPointVO.java @@ -8,13 +8,15 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.Date; @Data @AllArgsConstructor @NoArgsConstructor @JsonInclude(JsonInclude.Include.ALWAYS) -public class MemberPointVO { +public class MemberPointVO implements Serializable { + private static final long serialVersionUID = 1L; /** * 会员编号 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java index 344287ac..353839d4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java @@ -142,9 +142,9 @@ public class ApiMemberStructureController extends BaseController { if (isFind == null || isFind != 1) { log.error("当前会员日结信息不存在{}",settleTableName); } - startPage(); // 查询当前会员所有子点位信息 CuMember member = iCuMemberService.getMember(userId); + startPage(); List cuMemberThreeFrameworkVOS = iCumemberRetailDetailService.getCuMemberRetailDetailList(settleTableName,member.getMemberCode(),stage,stageStatus); return getDataTable(cuMemberThreeFrameworkVOS); }