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 83eb320c..5c09b74d 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 @@ -821,18 +821,16 @@ public class CuMemberController extends BaseController { /** * - * @param memberCode - * @param memberSettlePeriodId * @return */ @Log(module = EOperationModule.MEMBER_POINT, business = EOperationBusiness.MEMBER_POINT, method = EOperationMethod.SELECT) @PostMapping("/member-point-export") - public void memberPointExport(@RequestParam String memberCode,@RequestParam Long memberSettlePeriodId,@RequestParam String sort,@RequestParam String sortColumn, HttpServletResponse response) { - CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); + public void memberPointExport(@RequestBody MemberPointExportParam param, HttpServletResponse response) { + 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,memberCode,sort,sortColumn); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,param.getMemberCode(),param.getSort(),param.getMemberCode()); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberPointExportParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberPointExportParam.java new file mode 100644 index 00000000..5a4eb56e --- /dev/null +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/MemberPointExportParam.java @@ -0,0 +1,17 @@ +package com.hzs.member.base.param; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.web.bind.annotation.RequestParam; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class MemberPointExportParam { + private String memberCode; + private Long memberSettlePeriodId; + private String sort; + private String sortColumn; + +} diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml index d73f34a9..7224590f 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml @@ -84,7 +84,7 @@ AND cmr.MEMBER_CODE = #{memberCode} - ORDER BY ${sortColumn} ${sort} + ORDER BY cmr.${sortColumn} ${sort}