From 2955a2038ef4313a93cd1bf989033ca37e73e0c9 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Fri, 26 Sep 2025 16:39:18 +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=E6=8E=92=E5=BA=8F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/manage/CuMemberController.java | 10 ++++------ .../hzs/member/base/mapper/CuMemberRetailMapper.java | 2 +- .../member/base/service/ICuMemberRetailService.java | 2 +- .../base/service/impl/CuMemberRetailServiceImpl.java | 5 ++--- .../mapper/member/base/CuMemberRetailMapper.xml | 5 +++-- 5 files changed, 11 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 732379b8..83eb320c 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,7 +11,6 @@ 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.*; @@ -23,7 +22,6 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.base.CuMemberRetail; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.service.MemberTokenService; @@ -798,7 +796,7 @@ 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) { + public AjaxResult memberPoint(String memberCode,Long memberSettlePeriodId,String sort,String sortColumn) { if (memberSettlePeriodId == null) { log.error("参数错误{}", memberSettlePeriodId); return AjaxResult.error(); @@ -813,7 +811,7 @@ public class CuMemberController extends BaseController { log.error("当前表名不存在{}",settleTableName); return AjaxResult.error(); } - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); list.forEach(item -> { item.setMemberSettlePeriod(csPeriod.getSettleDate()); }); @@ -829,12 +827,12 @@ public class CuMemberController extends BaseController { */ @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, HttpServletResponse response) { + public void memberPointExport(@RequestParam String memberCode,@RequestParam Long memberSettlePeriodId,@RequestParam String sort,@RequestParam String sortColumn, HttpServletResponse response) { CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId); log.info("会员结算表信息{}",csPeriod); String settleTableName = TableNameConstants.CU_MEMBER_RETAIL_RANGE + csPeriod.getPkId(); log.info("会员结算表名称{}",settleTableName); - List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode); + List list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); 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 453672e1..6f4411e4 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); + List getMemberPointByMemberCode(@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); } 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 510dc8d1..1b9e1fb1 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); + List getMemberPointByMemberCode(String settleTableName, String memberCode,String sort,String sortColumn); List getMemberPointByUserId(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 f2c3ac9a..09070d76 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 @@ -7,7 +7,6 @@ import com.hzs.member.base.service.ICuMemberRetailService; import com.hzs.member.base.vo.memberPointVO; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** @@ -27,8 +26,8 @@ public class CuMemberRetailServiceImpl extends ServiceImpl getMemberPointByMemberCode(String settleTableName, String memberCode) { - return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode); + public List getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) { + return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn); } @Override 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 20de4174..d73f34a9 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 @@ -83,8 +83,9 @@ AND cmr.MEMBER_CODE = #{memberCode} - ORDER BY - cu.CREATION_TIME + + ORDER BY ${sortColumn} ${sort} +