Merge branch 'refs/heads/feature_member_score' into feature_member_score_zhangfeng

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

@@ -71,7 +71,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi {
         if (StringUtils.isBlank(req.getUniqueId())) {
             throw exception(SCORE_OPERATE_MUST_HAVE_UNIQUE_ID);
         }
-        MemberUserScoreLogDO memberUserScoreLogDO = logService.getByUniqueId(req.getUniqueId());
+        MemberUserScoreLogDO memberUserScoreLogDO = logService.getByUniqueId(req.getSourceType() + "_" + req.getUniqueId());
         if (memberUserScoreLogDO != null) {
             throw exception(SCORE_OPERATE_IDEMPOTENT_ERROR);
         }
@@ -133,13 +133,13 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi {
             }
         }
         return req.getMemberIds().stream().map(memberId -> operateScore(MemberUserScoreOperateReqDTO.builder()
-                .memberId(memberId)
-                .scoreCount(req.getScoreCount())
-                .operateType(req.getOperateType())
-                .sourceType(req.getSourceType())
-                .extParam(req.getExtParam())
-                .uniqueId(req.getUniqueId() + "_" + memberId)
-                .build()))
+                        .memberId(memberId)
+                        .scoreCount(req.getScoreCount())
+                        .operateType(req.getOperateType())
+                        .sourceType(req.getSourceType())
+                        .extParam(req.getExtParam())
+                        .uniqueId(req.getUniqueId() + "_" + memberId)
+                        .build()))
                 .collect(Collectors.toList());
     }
 
@@ -200,7 +200,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi {
                         req.getOperateType().getValue() : req.getSourceType().getOperateType().getValue())
                 .sourceType(req.getSourceType().getValue())
                 .extParam(req.getExtParam())
-                .uniqueId(req.getUniqueId())
+                .uniqueId(req.getSourceType() + "_" + req.getUniqueId())
                 .build());
     }
 }

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

@@ -64,7 +64,7 @@ public class MemberUserScoreExpireTask implements JobHandler {
                                 .memberId(memberUserScoreDetailDO.getMemberId())
                                 .scoreCount(memberUserScoreDetailDO.getRemainCount())
                                 .sourceType(ScoreSourceTypeEnum.SYSTEM_EXPIRED)
-                                .uniqueId(ScoreSourceTypeEnum.SYSTEM_EXPIRED +"_"+ memberUserScoreDetailDO.getId() + "_" + System.currentTimeMillis())
+                                .uniqueId(memberUserScoreDetailDO.getId() + "_" + System.currentTimeMillis())
                                 .extParam(extParam)
                         .build());
             } catch (Exception e) {

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

@@ -60,7 +60,7 @@ public class MemberUserScoreController {
                 .operateType(ScoreOperateTypeEnum.parseByValue(query.getOperateType()))
                 .sourceType(ScoreSourceTypeEnum.MANUAL_OPERATE)
                 .extParam(extParam)
-                .uniqueId(ScoreSourceTypeEnum.MANUAL_OPERATE + "_" + System.currentTimeMillis())
+                .uniqueId(String.valueOf(System.currentTimeMillis()))
                 .build());
         return success(null);
     }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/auth/vo/AppAuthRegReqVO.java

@@ -43,4 +43,7 @@ public class AppAuthRegReqVO {
 
     @ApiModelProperty(value = "英文名称", required = false, example = "+86")
     private String englishName;
+    @ApiModelProperty(value = "推荐码", required = false)
+    private String referralCode;
+
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java

@@ -95,6 +95,8 @@ public class MemberUserDO extends TenantBaseDO {
      */
     private String controlPassword;
 
+    private String referralCode;
+
     ///**
     // * 是否身份认证
     // */

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

@@ -55,7 +55,7 @@ public class MemberUserScoreDetailExpireListener {
                         .memberId(detail.getMemberId())
                         .scoreCount(detail.getRemainCount())
                         .sourceType(ScoreSourceTypeEnum.SYSTEM_EXPIRED)
-                        .uniqueId(ScoreSourceTypeEnum.SYSTEM_EXPIRED +"_"+ detail.getId() + "_" + System.currentTimeMillis())
+                        .uniqueId(detail.getId() + "_" + System.currentTimeMillis())
                         .extParam(extParam)
                         .build());
             } catch (Exception e) {

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java

@@ -117,7 +117,7 @@ public class MemberAuthServiceImpl implements MemberAuthService {
         }
 
         // 获得获得注册用户
-        MemberUserDO user = userService.createUser(reqVO.getMobile(), userIp, reqVO.getPassword(),reqVO.getAreaCode(), reqVO.getEnglishName());
+        MemberUserDO user = userService.createUser(reqVO.getMobile(), userIp, reqVO.getPassword(),reqVO.getAreaCode(), reqVO.getEnglishName(), reqVO.getReferralCode());
         Assert.notNull(user, "创建用户失败，结果为空");
 
         //记录日志

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java

 package cn.iocoder.yudao.module.member.service.user;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.validation.Mobile;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.member.api.user.dto.UserSelectReqVO;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.UserBackVO;
@@ -51,9 +50,10 @@ public interface MemberUserService {
      * @param mobile
      * @param registerIp
      * @param password
+     * @param referralCode
      * @return
      */
-    MemberUserDO createUser(String mobile, String registerIp, String password, String areaCode, String englishName);
+    MemberUserDO createUser(String mobile, String registerIp, String password, String areaCode, String englishName, String referralCode);
 
     /**
      * 更新用户的最后登陆信息

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -172,7 +172,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         }
         String englishName = maskMobileNumber(mobile);
         // 用户不存在，则进行创建
-        user = this.createUser(mobile, registerIp, null, areaCode, englishName);
+        user = this.createUser(mobile, registerIp, null, areaCode, englishName, null);
 
         //记录日志
         UserOperationLogCreateReqVO userOperationLogCreateReqVO = new UserOperationLogCreateReqVO();
@@ -202,7 +202,7 @@ public class MemberUserServiceImpl implements MemberUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public MemberUserDO createUser(String mobile, String registerIp, String password, String areacode, String englishName) {
+    public MemberUserDO createUser(String mobile, String registerIp, String password, String areacode, String englishName, String referralCode) {
         // 生成密码
        /* if (StrUtil.isBlank(password)) {
             password = IdUtil.fastSimpleUUID();
@@ -222,6 +222,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         user.setEnglishName(englishName);
         user.setNickname(englishName);
         user.setCode(getNextMemberCode());
+        user.setReferralCode(referralCode);
         memberUserMapper.insert(user);
         //站内信
         InternalMessageCreateDto dto = InternalMessageCreateDto.builder().toIdList(Arrays.asList(user.getId()))

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/api/reward/RedeemRewardApiImpl.java

@@ -116,7 +116,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
                 .sourceType(ScoreSourceTypeEnum.EXCHANGE_REWARD)
                 .scoreCount(redeemRewardReqVO.getRewardCount() * rewardDO.getPointsRequire())
                 .releationId(String.valueOf(redeemId))
-                .uniqueId(ScoreSourceTypeEnum.EXCHANGE_REWARD + "_" + redeemId)
+                .uniqueId(String.valueOf(redeemId))
                 .extParam(extParam)
                 .build());
     }

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/service/redeem/RewardRedeemServiceImpl.java

@@ -274,7 +274,7 @@ public class RewardRedeemServiceImpl extends AbstractService<RewardRedeemMapper,
                 .scoreCount(rewardRedeemDO.getScoreCount())
                 .extParam(extParam)
                 .releationId(String.valueOf(req.getId()))
-                .uniqueId(ScoreSourceTypeEnum.EXCHANGE_REWARD_CANCEL + "_" + req.getId())
+                .uniqueId(String.valueOf(req.getId()))
                 .build());
         return true;
     }