From 1d7e51a2f1000fce8b47f1976cf0a29f8f8d5b2a Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 21 Oct 2025 11:05:44 +0800 Subject: [PATCH] =?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); }