## 会员升级记录；

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<CuMemberLevelMapper, C
         LambdaQueryWrapper<CuMemberLevel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CuMemberLevel::getPeriod, period);
         queryWrapper.eq(CuMemberLevel::getUpType, EUpgradeType.AUTO_UPGRADE.getValue());
+        queryWrapper.orderByDesc(CuMemberLevel::getPkId);
         return baseMapper.selectList(queryWrapper);
     }
 

hzs-business/hzs-business-bonus/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml

@@ -38,7 +38,7 @@
         <foreach item="item" index="index" collection="cuMemberLevelList" separator=" ">
             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},

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;
 
 /**
- * <p>
  * 会员注册权限修改记录表 前端控制器
- * </p>
  *
  * @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) {

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<CuMemberLevelExt> list = iCuMemberLevelService.listMemberLevelList(param);
+        return getDataTable(list);
+    }
+
+}

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<CuMemberLevel> {
 
+    /**
+     * 查询会员升级列表
+     *
+     * @param param
+     * @return
+     */
+    List<CuMemberLevelExt> listMemberLevelList(CuMemberLevelParam param);
+
     /**
      * 查询手动 + 自动升级的最新一条
      *

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;
+
+}

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<CuMemberLevel> {
 
+    /**
+     * 查询会员等级列表
+     *
+     * @param param
+     * @return
+     */
+    List<CuMemberLevelExt> listMemberLevelList(CuMemberLevelParam param);
+
     /**
      * 删除会员等级升级记录
      *

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<CuMemberLevelMapper, CuMemberLevel> implements ICuMemberLevelService {
 
+    @Override
+    public List<CuMemberLevelExt> listMemberLevelList(CuMemberLevelParam param) {
+        return baseMapper.listMemberLevelList(param);
+    }
+
     @Override
     public void deleteCuMemberLevelRecord(Long pkOrder, Long pkApprove, Date currentDateTime) {
         UpdateWrapper<CuMemberLevel> updateWrapper = new UpdateWrapper<>();

hzs-business/hzs-business-member/src/main/resources/mapper/member/detail/CuMemberLevelMapper.xml

@@ -21,6 +21,23 @@
         <result column="PERIOD" property="period"/>
     </resultMap>
 
+    <!-- 查询会员升级列表 -->
+    <select id="listMemberLevelList" resultType="com.hzs.common.domain.member.detail.ext.CuMemberLevelExt">
+        select cml.*, cm.member_code, cm.member_name, bgo.grade_name grade_name_old, bgn.grade_name grade_name_new
+        from cu_member_level cml
+        left join cu_member cm
+        on cm.pk_id = cml.pk_member
+        left join bd_grade bgo
+        on bgo.pk_id = cml.old_level
+        left join bd_grade bgn
+        on bgn.pk_id = cml.new_level
+        where cml.del_flag = 0
+        <if test="param.memberCode != null and param.memberCode != ''">
+            and cm.member_code like #{param.memberCode} || '%'
+        </if>
+        order by cml.creation_time desc
+    </select>
+
     <!-- 查询手动 + 自动升级的最新一条 -->
     <select id="queryLastManualUpgrade" resultMap="CuMemberLevel">
         select *

hzs-common/hzs-common-domain/src/main/java/com/hzs/common/domain/member/detail/ext/CuMemberLevelExt.java

@@ -0,0 +1,31 @@
+package com.hzs.common.domain.member.detail.ext;
+
+import com.hzs.common.domain.member.detail.CuMemberLevel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CuMemberLevelExt extends CuMemberLevel {
+
+    /**
+     * 会员编号
+     */
+    private String memberCode;
+
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+
+    /**
+     * 旧等级
+     */
+    private String gradeNameOld;
+
+    /**
+     * 新等级
+     */
+    private String gradeNameNew;
+
+}