From ac43ec555306c2268aeedad3357e3ebe098c7dda Mon Sep 17 00:00:00 2001 From: zhangheng Date: Fri, 26 Sep 2025 16:22:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=86=E9=A1=B5=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/manage/CuMemberController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 345a27f8..732379b8 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 @@ -11,6 +11,7 @@ import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.constant.VertexConstants; +import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; @@ -797,10 +798,10 @@ public class CuMemberController extends BaseController { */ @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT) @GetMapping("/member-point") - public TableDataInfo memberPoint(String memberCode,Long memberSettlePeriodId) { + public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId) { if (memberSettlePeriodId == null) { log.error("参数错误{}", memberSettlePeriodId); - return null; + return AjaxResult.error(); } CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("会员结算表信息{}",csPeriod); @@ -810,14 +811,14 @@ public class CuMemberController extends BaseController { Integer isFind = iCuMemberRetailService.getFindCuMemberRetailDetail(settleTableName); if (isFind == null || isFind != 1) { log.error("当前表名不存在{}",settleTableName); - return null; + return AjaxResult.error(); } List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); startPage(); - return getDataTable(list); + return AjaxResult.success(getDataTable(list)); } /**