Merge branch 'feature_member_score_zby' into feature_member_score

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/api/score/MemberUserScoreApiImpl.java

@@ -2,17 +2,17 @@ package cn.iocoder.yudao.module.member.api.score;
 
 import cn.iocoder.yudao.framework.apollo.core.event.export.MemberScoreDetailExpireEvent;
 import cn.iocoder.yudao.module.member.api.score.dto.*;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore.MemberUserScoreDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation.MemberUserScoreDetailReleationDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation.MemberUserScoreDetailReleationDO;
 import cn.iocoder.yudao.module.member.dto.ScoreDetailChangeDto;
 import cn.iocoder.yudao.module.member.enums.MemberScoreDetailReleationStatueEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
-import cn.iocoder.yudao.module.member.service.memberUserScore.MemberUserScoreService;
-import cn.iocoder.yudao.module.member.service.memberUserScoreDetail.MemberUserScoreDetailService;
-import cn.iocoder.yudao.module.member.service.memberUserScoreDetailReleation.MemberUserScoreDetailReleationService;
-import cn.iocoder.yudao.module.member.service.memberUserScoreLog.MemberUserScoreLogService;
+import cn.iocoder.yudao.module.member.service.score.MemberUserScoreService;
+import cn.iocoder.yudao.module.member.service.scoreDetail.MemberUserScoreDetailService;
+import cn.iocoder.yudao.module.member.service.scoreDetailReleation.MemberUserScoreDetailReleationService;
+import cn.iocoder.yudao.module.member.service.scoreLog.MemberUserScoreLogService;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogCreateReq;
 import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/job/MemberUserScoreExpireTask.java

@@ -5,10 +5,10 @@ import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
 import cn.iocoder.yudao.module.member.enums.MemberScoreStatueEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
-import cn.iocoder.yudao.module.member.service.memberUserScoreDetail.MemberUserScoreDetailService;
+import cn.iocoder.yudao.module.member.service.scoreDetail.MemberUserScoreDetailService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberUserScore/MemberUserScoreController.java

@@ -7,7 +7,7 @@ import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreBatchOperateR
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateRespDTO;
 import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
-import cn.iocoder.yudao.module.member.service.memberUserScore.MemberUserScoreService;
+import cn.iocoder.yudao.module.member.service.score.MemberUserScoreService;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreOperateQueryVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreQueryVO;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberUserScoreLog/MemberUserScoreLogController.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.member.controller.admin.memberUserScoreLog;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.member.service.memberUserScoreLog.MemberUserScoreLogService;
+import cn.iocoder.yudao.module.member.service.scoreLog.MemberUserScoreLogService;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogQueryVO;
 import io.swagger.annotations.Api;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberUserLevelConfigDO.java

+package cn.iocoder.yudao.module.member.dal.dataobject.level;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("member_user_level_config")
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class MemberUserLevelConfigDO extends BaseDO {
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 积分范围 下界
+     */
+    private Integer lowerCount;
+    /**
+     * 积分范围 上界
+     */
+    private Integer upperCount;
+    /**
+     * 图标
+     */
+    private String icon;
+}

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserScore/MemberUserScoreBackDO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/score/MemberUserScoreBackDO.java

-package cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore;
+package cn.iocoder.yudao.module.member.dal.dataobject.score;
 
 public class MemberUserScoreBackDO {
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserScore/MemberUserScoreDO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/score/MemberUserScoreDO.java

-package cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore;
+package cn.iocoder.yudao.module.member.dal.dataobject.score;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserScoreDetail/MemberUserScoreDetailDO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/scoreDetail/MemberUserScoreDetailDO.java

-package cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail;
+package cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
@@ -6,12 +6,9 @@ import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import io.vavr.collection.List;
 import lombok.*;
-import org.apache.commons.lang.StringUtils;
 
 import java.util.Date;
-import java.util.Map;
 
 /**
  * 会员积分 DO

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserScoreDetailReleation/MemberUserScoreDetailReleationDO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/scoreDetailReleation/MemberUserScoreDetailReleationDO.java

-package cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation;
+package cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-import java.util.Date;
-
 /**
  * 会员积分 DO
  *

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberUserScoreLog/MemberUserScoreLogDO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/scoreLog/MemberUserScoreLogDO.java

-package cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreLog;
+package cn.iocoder.yudao.module.member.dal.dataobject.scoreLog;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberUserLevel/MemberUserLevelConfigMapper.java

+package cn.iocoder.yudao.module.member.dal.mysql.memberUserLevel;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
+import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberUserLevelConfigDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 会员等级 Mapper
+ * @author 系统管理员
+ */
+@Mapper
+public interface MemberUserLevelConfigMapper extends AbstractMapper<MemberUserLevelConfigDO> {
+
+}

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberUserScore/MemberUserScoreMapper.java

 package cn.iocoder.yudao.module.member.dal.mysql.memberUserScore;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore.MemberUserScoreDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreQueryVO;
 import org.apache.ibatis.annotations.Mapper;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberUserScoreDetail/MemberUserScoreDetailMapper.java

 package cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreDetail;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreLog.MemberUserScoreLogDO;
-import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogBackVO;
-import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogQueryVO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * 会员积分详情 Mapper

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberUserScoreDetailReleation/MemberUserScoreDetailReleationMapper.java

 package cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreDetailReleation;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation.MemberUserScoreDetailReleationDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation.MemberUserScoreDetailReleationDO;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.Collection;
 
 /**
  * 会员积分详情 Mapper

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberUserScoreLog/MemberUserScoreLogMapper.java

 package cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreLog;
 
 import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreLog.MemberUserScoreLogDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreLog.MemberUserScoreLogDO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogQueryVO;
 import org.apache.ibatis.annotations.Mapper;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/listener/MemberUserScoreDetailExpireListener.java

@@ -6,9 +6,9 @@ import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.apollo.core.event.export.MemberScoreDetailExpireEvent;
 import cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
-import cn.iocoder.yudao.module.member.service.memberUserScoreDetail.MemberUserScoreDetailService;
+import cn.iocoder.yudao.module.member.service.scoreDetail.MemberUserScoreDetailService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScore/MemberUserScoreService.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/score/MemberUserScoreService.java

-package cn.iocoder.yudao.module.member.service.memberUserScore;
+package cn.iocoder.yudao.module.member.service.score;
 
 import java.util.*;
 
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreUpdateReqDTO;
 import cn.iocoder.yudao.module.member.vo.memberUserScore.*;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore.MemberUserScoreDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 
 /**

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScore/MemberUserScoreServiceImpl.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/score/MemberUserScoreServiceImpl.java

-package cn.iocoder.yudao.module.member.service.memberUserScore;
+package cn.iocoder.yudao.module.member.service.score;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreUpdateReqDTO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore.MemberUserScoreDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO;
 import cn.iocoder.yudao.module.member.dal.mysql.memberUserScore.MemberUserScoreMapper;
 import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreDetail/MemberUserScoreDetailService.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreDetail/MemberUserScoreDetailService.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreDetail;
+package cn.iocoder.yudao.module.member.service.scoreDetail;
 
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreDetailUpdateReqDto;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
 import cn.iocoder.yudao.module.member.dto.ScoreDetailChangeDto;
 
 import java.util.List;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreDetail/MemberUserScoreDetailServiceImpl.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreDetail/MemberUserScoreDetailServiceImpl.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreDetail;
+package cn.iocoder.yudao.module.member.service.scoreDetail;
 
 import cn.hutool.core.lang.generator.SnowflakeGenerator;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreDetailUpdateReqDto;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetail.MemberUserScoreDetailDO;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation.MemberUserScoreDetailReleationDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetail.MemberUserScoreDetailDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation.MemberUserScoreDetailReleationDO;
 import cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreDetail.MemberUserScoreDetailMapper;
 import cn.iocoder.yudao.module.member.dto.ScoreDetailChangeDto;
 import cn.iocoder.yudao.module.member.enums.MemberScoreStatueEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
-import cn.iocoder.yudao.module.member.service.memberUserScoreDetailReleation.MemberUserScoreDetailReleationService;
+import cn.iocoder.yudao.module.member.service.scoreDetailReleation.MemberUserScoreDetailReleationService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreDetailReleation/MemberUserScoreDetailReleationService.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreDetailReleation/MemberUserScoreDetailReleationService.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreDetailReleation;
+package cn.iocoder.yudao.module.member.service.scoreDetailReleation;
 
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation.MemberUserScoreDetailReleationDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation.MemberUserScoreDetailReleationDO;
 import cn.iocoder.yudao.module.member.dto.ScoreDetailChangeDto;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
 

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreDetailReleation/MemberUserScoreDetailReleationServiceImpl.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreDetailReleation/MemberUserScoreDetailReleationServiceImpl.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreDetailReleation;
+package cn.iocoder.yudao.module.member.service.scoreDetailReleation;
 
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreDetailReleation.MemberUserScoreDetailReleationDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreDetailReleation.MemberUserScoreDetailReleationDO;
 import cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreDetailReleation.MemberUserScoreDetailReleationMapper;
 import cn.iocoder.yudao.module.member.dto.ScoreDetailChangeDto;
 import cn.iocoder.yudao.module.member.enums.MemberScoreDetailReleationStatueEnum;
-import cn.iocoder.yudao.module.member.enums.ScoreOperateTypeEnum;
 import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreLog/MemberUserScoreLogService.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreLog/MemberUserScoreLogService.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreLog;
+package cn.iocoder.yudao.module.member.service.scoreLog;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreLog.MemberUserScoreLogDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreLog.MemberUserScoreLogDO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogCreateReq;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogQueryVO;

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/memberUserScoreLog/MemberUserScoreLogServiceImpl.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/scoreLog/MemberUserScoreLogServiceImpl.java

-package cn.iocoder.yudao.module.member.service.memberUserScoreLog;
+package cn.iocoder.yudao.module.member.service.scoreLog;
 
 import cn.hutool.core.lang.generator.SnowflakeGenerator;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
-import cn.iocoder.yudao.module.member.dal.dataobject.memberUserScoreLog.MemberUserScoreLogDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.scoreLog.MemberUserScoreLogDO;
 import cn.iocoder.yudao.module.member.dal.mysql.memberUserScoreLog.MemberUserScoreLogMapper;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogBackVO;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogCreateReq;
 import cn.iocoder.yudao.module.member.vo.memberUserScoreLog.MemberUserScoreLogQueryVO;
 import cn.iocoder.yudao.module.system.service.dict.DictTypeService;
-import com.alibaba.excel.util.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.Collections;
-import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.MEMBER_ID_IS_NULL;

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserLevelConfigMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iocoder.yudao.module.member.dal.mysql.memberUserLevel.MemberUserLevelConfigMapper">
+
+</mapper>

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreMapper.xml

@@ -36,7 +36,7 @@
         <include refid="scoreCondition"/>
     </select>
     <select id="getByMemberId"
-            resultType="cn.iocoder.yudao.module.member.dal.dataobject.memberUserScore.MemberUserScoreDO">
+            resultType="cn.iocoder.yudao.module.member.dal.dataobject.score.MemberUserScoreDO">
         select * from member_user_score where member_id = #{memberId} and deleted = 0
     </select>