From 92df472203428918cba0718119d59507e28f6d01 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 21 Apr 2025 10:09:18 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberLevelServiceImpl.java | 1 + .../member/detail/CuMemberLevelMapper.xml | 2 +- .../manage/CuMemberAuthorityController.java | 8 +---- .../manage/CuMemberLevelController.java | 35 +++++++++++++++++++ .../detail/mapper/CuMemberLevelMapper.java | 12 +++++++ .../detail/param/CuMemberLevelParam.java | 13 +++++++ .../detail/service/ICuMemberLevelService.java | 10 ++++++ .../impl/CuMemberLevelServiceImpl.java | 8 +++++ .../member/detail/CuMemberLevelMapper.xml | 17 +++++++++ .../member/detail/ext/CuMemberLevelExt.java | 31 ++++++++++++++++ 10 files changed, 129 insertions(+), 8 deletions(-) create mode 100644 hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java create mode 100644 hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java create mode 100644 hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/detail/ext/CuMemberLevelExt.java diff --git a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java index 8417be3a..a41726ad 100644 --- a/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/hzs-business/hzs-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuMemberLevelServiceImpl.java @@ -102,6 +102,7 @@ public class CuMemberLevelServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CuMemberLevel::getPeriod, period); queryWrapper.eq(CuMemberLevel::getUpType, EUpgradeType.AUTO_UPGRADE.getValue()); + queryWrapper.orderByDesc(CuMemberLevel::getPkId); return baseMapper.selectList(queryWrapper); } diff --git a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml index 609f327b..63b12466 100644 --- a/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml +++ b/hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml @@ -38,7 +38,7 @@ into CU_MEMBER_LEVEL ( pk_member, period, up_type, old_level, new_level, - upgrade_time, pk_creator,pk_country + upgrade_time, pk_creator, pk_country ) values ( #{item.pkMember}, #{item.period}, #{item.upType}, #{item.oldLevel}, #{item.newLevel}, diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java index b7f16881..a5a28bf3 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberAuthorityController.java @@ -12,9 +12,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - *

* 会员注册权限修改记录表 前端控制器 - *

* * @author zhangjing * @since 2022-10-20 @@ -27,11 +25,7 @@ public class CuMemberAuthorityController extends BaseController { private ICuMemberAuthorityService cuMemberAuthorityService; /** - * @description: 查询修改注册权限列表 - * @author: zhang jing - * @date: 2022/10/20 10:36 - * @param: [memberAuthorityParam] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询修改注册权限列表 **/ @GetMapping("/list") public TableDataInfo list(CuMemberAuthorityParam memberAuthorityParam) { diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java new file mode 100644 index 00000000..1d75a4e1 --- /dev/null +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/controller/manage/CuMemberLevelController.java @@ -0,0 +1,35 @@ +package com.hzs.member.detail.controller.manage; + +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.page.TableDataInfo; +import com.hzs.common.domain.member.detail.ext.CuMemberLevelExt; +import com.hzs.member.detail.param.CuMemberLevelParam; +import com.hzs.member.detail.service.ICuMemberLevelService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 会员升级记录查询 + */ +@RestController +@RequestMapping("/manager/member-level") +public class CuMemberLevelController extends BaseController { + + @Autowired + private ICuMemberLevelService iCuMemberLevelService; + + /** + * 升级记录列表 + **/ + @GetMapping("/list") + public TableDataInfo list(CuMemberLevelParam param) { + startPage(); + List list = iCuMemberLevelService.listMemberLevelList(param); + return getDataTable(list); + } + +} diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java index 20448040..06ff89c2 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberLevelMapper.java @@ -2,8 +2,12 @@ package com.hzs.member.detail.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.detail.CuMemberLevel; +import com.hzs.common.domain.member.detail.ext.CuMemberLevelExt; +import com.hzs.member.detail.param.CuMemberLevelParam; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 会员信息-等级升级记录 Mapper 接口 * @@ -12,6 +16,14 @@ import org.apache.ibatis.annotations.Param; */ public interface CuMemberLevelMapper extends BaseMapper { + /** + * 查询会员升级列表 + * + * @param param + * @return + */ + List listMemberLevelList(CuMemberLevelParam param); + /** * 查询手动 + 自动升级的最新一条 * diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java new file mode 100644 index 00000000..7490d0e8 --- /dev/null +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/param/CuMemberLevelParam.java @@ -0,0 +1,13 @@ +package com.hzs.member.detail.param; + +import lombok.Data; + +@Data +public class CuMemberLevelParam { + + /** + * 会员编号 + */ + private String memberCode; + +} diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java index 3ccc2299..667760d4 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberLevelService.java @@ -2,6 +2,8 @@ package com.hzs.member.detail.service; import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.detail.CuMemberLevel; +import com.hzs.common.domain.member.detail.ext.CuMemberLevelExt; +import com.hzs.member.detail.param.CuMemberLevelParam; import java.util.Date; import java.util.List; @@ -14,6 +16,14 @@ import java.util.List; */ public interface ICuMemberLevelService extends IService { + /** + * 查询会员等级列表 + * + * @param param + * @return + */ + List listMemberLevelList(CuMemberLevelParam param); + /** * 删除会员等级升级记录 * diff --git a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java index 88163b05..1bb83f7d 100644 --- a/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java +++ b/hzs-business/hzs-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberLevelServiceImpl.java @@ -6,11 +6,14 @@ import com.hzs.common.core.constant.SaOrderFieldConstants; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.domain.member.detail.CuMemberLevel; +import com.hzs.common.domain.member.detail.ext.CuMemberLevelExt; import com.hzs.member.detail.mapper.CuMemberLevelMapper; +import com.hzs.member.detail.param.CuMemberLevelParam; import com.hzs.member.detail.service.ICuMemberLevelService; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * 会员信息-等级升级记录 服务实现类 @@ -21,6 +24,11 @@ import java.util.Date; @Service public class CuMemberLevelServiceImpl extends ServiceImpl implements ICuMemberLevelService { + @Override + public List listMemberLevelList(CuMemberLevelParam param) { + return baseMapper.listMemberLevelList(param); + } + @Override public void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); diff --git a/hzs-business/hzs-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml b/hzs-business/hzs-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml index 8b3413e3..82c6995c 100644 --- a/hzs-business/hzs-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml +++ b/hzs-business/hzs-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml @@ -21,6 +21,23 @@ + + +