Merge remote-tracking branch 'origin/feature/mall_product' into member_dev

# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelRecordDO.java

@@ -52,6 +52,7 @@ public class MemberLevelRecordDO extends BaseDO {
      * 会员此时的经验
      */
     private Integer userExperience;
+    // TODO @疯狂：是不是 remark 和 description 可以合并成 description 就够了
     /**
      * 备注
      */

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberExperienceRecordService.java

@@ -39,6 +39,16 @@ public interface MemberExperienceRecordService {
      */
     PageResult<MemberExperienceRecordDO> getExperienceLogPage(MemberExperienceRecordPageReqVO pageReqVO);
 
+    /**
+     * 获得会员经验记录列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 会员经验记录列表
+     */
+    List<MemberExperienceLogDO> getExperienceLogList(MemberExperienceLogExportReqVO exportReqVO);
+
+    // TODO @疯狂：类似 MemberLevelLogService 的方法，这里也需要提供一个通用的方法，用于创建经验变动记录
+
     /**
      * 创建 手动调整 经验变动记录
      *

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelRecordService.java

@@ -47,6 +47,16 @@ public interface MemberLevelRecordService {
      */
     PageResult<MemberLevelRecordDO> getLevelLogPage(MemberLevelRecordPageReqVO pageReqVO);
 
+    /**
+     * 获得会员等级记录列表, 用于 Excel 导出
+     *
+     * @param exportReqVO 查询条件
+     * @return 会员等级记录列表
+     */
+    List<MemberLevelLogDO> getLevelLogList(MemberLevelLogExportReqVO exportReqVO);
+
+    // TODO @疯狂：把 createCancelLog、createAdjustLog、createAutoUpgradeLog 几个日志合并成一个通用的日志方法；整体的内容，交给 MemberLevelService 去做；以及对应的 level 变化的通知；
+
     /**
      * 创建记录： 取消等级
      *

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java

@@ -141,7 +141,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
     @VisibleForTesting
     void validateConfigValid(Long id, String name, Integer level, Integer experience) {
         List<MemberLevelDO> list = levelMapper.selectList();
-
         // 校验名称唯一
         validateNameUnique(list, id, name);
         // 校验等级唯一
@@ -178,19 +177,14 @@ public class MemberLevelServiceImpl implements MemberLevelService {
         return levelMapper.selectListByStatus(status);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateUserLevel(MemberUserUpdateLevelReqVO updateReqVO) {
         MemberUserDO user = memberUserMapper.selectById(updateReqVO.getId());
         if (user == null) {
             throw exception(USER_NOT_EXISTS);
         }
-
-        // 未调整的情况1
-        if (user.getLevelId() == null && updateReqVO.getLevelId() == null) {
-            return;
-        }
-        // 未调整的情况2
+        // 等级未发生变化
         if (ObjUtil.equal(user.getLevelId(), updateReqVO.getLevelId())) {
             return;
         }
@@ -218,36 +212,40 @@ public class MemberLevelServiceImpl implements MemberLevelService {
             updateUserLevelIdAndExperience(user.getId(), updateReqVO.getLevelId(), totalExperience);
         }
 
-
         // 记录会员经验变动
         memberExperienceRecordService.createAdjustLog(user.getId(), experience, totalExperience);
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    // TODO @疯狂：方法名，建议改成 increase 或者 add 经验，和项目更统一一些
+    // TODO @疯狂：bizType 改成具体数值，主要是枚举在 api 不好传递，rpc 情况下
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void plusExperience(Long userId, Integer experience, MemberExperienceBizTypeEnum bizType, String bizId) {
         if (experience == 0) {
             return;
         }
 
         MemberUserDO user = memberUserMapper.selectById(userId);
-        if (user.getExperience() == null) {
-            user.setExperience(0);
-        }
 
         // 防止扣出负数
         int userExperience = NumberUtil.max(user.getExperience() + experience, 0);
-
         // 创建经验记录
         memberExperienceRecordService.createBizLog(userId, experience, userExperience, bizType, bizId);
 
         // 计算会员等级
-        Long levelId = calcLevel(user, userExperience);
+        MemberLevelDO newLevel = calculateNewLevel(user, userExperience);
+        Long newLevelId = null;
+        if (newLevel != null) {
+            newLevelId = newLevel.getId();
+            // 保存等级变更记录
+            memberLevelRecordService.createAutoUpgradeLog(user, newLevel);
+        }
 
         // 更新会员表上的等级编号、经验值
-        updateUserLevelIdAndExperience(user.getId(), levelId, userExperience);
+        updateUserLevelIdAndExperience(user.getId(), newLevelId, userExperience);
     }
 
+    // TODO @疯狂：让 memberUserService 那开个方法；每个模块，不直接操作对方的 mapper；
     private void updateUserLevelIdAndExperience(Long userId, Long levelId, Integer experience) {
         memberUserMapper.updateById(new MemberUserDO()
                 .setId(userId)
@@ -262,7 +260,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
      * @param userExperience 会员当前的经验值
      * @return 会员等级编号，null表示无变化
      */
-    private Long calcLevel(MemberUserDO user, int userExperience) {
+    private MemberLevelDO calculateNewLevel(MemberUserDO user, int userExperience) {
         List<MemberLevelDO> list = getEnableLevelList();
         if (CollUtil.isEmpty(list)) {
             log.warn("计算会员等级失败：会员等级配置不存在");
@@ -283,8 +281,6 @@ public class MemberLevelServiceImpl implements MemberLevelService {
             return null;
         }
 
-        // 保存等级变更记录
-        memberLevelRecordService.createAutoUpgradeLog(user, matchLevel);
-        return matchLevel.getId();
+        return matchLevel;
     }
 }