angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 会员点位信息排序查询

This commit is contained in:
zhangheng 2025-09-26 16:39:18 +08:00
parent ca9890ad4c
commit 2955a2038e
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java
View File

@ -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<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
List<memberPointVO> 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<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode);
List<memberPointVO> list = iCuMemberRetailService.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
list.forEach(item -> {
item.setMemberSettlePeriod(csPeriod.getSettleDate());
});

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailMapper.java
View File

@ -20,7 +20,7 @@ public interface CuMemberRetailMapper extends BaseMapper<CuMemberRetail> {
Integer getFindCumemberRetailDetail(@Param("settleTableName") String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode);
List<memberPointVO> getMemberPointByMemberCode(@Param("settleTableName") String settleTableName, @Param("memberCode") String memberCode,@Param("sort") String sort,@Param("sortColumn") String sortColumn);
List<memberPointVO> getMemberPointByUserId(@Param("settleTableName") String settleTableName, @Param("userId") Long userId);
}

2
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberRetailService.java
View File

@ -17,7 +17,7 @@ public interface ICuMemberRetailService{
Integer getFindCuMemberRetailDetail(String settleTableName);
List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode);
List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode,String sort,String sortColumn);
List<memberPointVO> getMemberPointByUserId(String settleTableName, Long userId);
}

5
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberRetailServiceImpl.java
View File

@ -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<CuMemberRetailMapper,
}
@Override
public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode) {
return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode);
public List<memberPointVO> getMemberPointByMemberCode(String settleTableName, String memberCode, String sort, String sortColumn) {
return baseMapper.getMemberPointByMemberCode(settleTableName,memberCode,sort,sortColumn);
}
@Override

5
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberRetailMapper.xml
View File

@ -83,8 +83,9 @@
<if test="memberCode != null and memberCode != ''">
AND cmr.MEMBER_CODE = #{memberCode}
</if>
ORDER BY
cu.CREATION_TIME
<if test="sort != null and sort != '' and sortColumn != null and sortColumn != ''">
ORDER BY ${sortColumn} ${sort}
</if>
</select>
<select id="getMemberPointByUserId" resultType="com.hzs.member.base.vo.memberPointVO">
SELECT