Merge branch 'refs/heads/feature_member_score' into dev

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/score/core/RecommendStrategy.java

@@ -55,7 +55,7 @@ public class RecommendStrategy extends AbstractScoreRuleStrategy {
             map.put("userId", userId);
             map.put("userNameZh", message.getUserNameZh());
             map.put("userNameEn", message.getUserNameEn());
-            String desensitizedPhoneNumber = message.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
+            String desensitizedPhoneNumber = memberUserDO.getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2");
             map.put("phone", desensitizedPhoneNumber);
 
             memberUserScoreApi.operateScore(MemberUserScoreOperateReqDTO.builder()
@@ -65,6 +65,7 @@ public class RecommendStrategy extends AbstractScoreRuleStrategy {
                     .ruleId(scoreRuleDO.getId())
                     .uniqueId(userId + "_" + message.getRecommendUserId())
                     .expireDays(scoreRuleDO.getScorePeriod())
+                    .extParam(map)
                     .build());
         } catch (Exception e) {
             log.error("Recommend listener: operateScore error", e);

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/mq/consumer/score/core/RegisterStrategy.java

@@ -27,8 +27,8 @@ public class RegisterStrategy extends AbstractScoreRuleStrategy {
     @Resource
     private MemberUserService memberUserService;
 
-    public RegisterStrategy(ScoreRuleService scoreRuleService, MemberUserScoreLogService memberUserScoreLogService, MemberUserService memberUserService,MemberUserScoreApi memberUserScoreApi) {
-        super(scoreRuleService, memberUserScoreLogService, memberUserService,memberUserScoreApi);
+    public RegisterStrategy(ScoreRuleService scoreRuleService, MemberUserScoreLogService memberUserScoreLogService, MemberUserService memberUserService, MemberUserScoreApi memberUserScoreApi) {
+        super(scoreRuleService, memberUserScoreLogService, memberUserService, memberUserScoreApi);
     }
 
     @Override
@@ -68,6 +68,7 @@ public class RegisterStrategy extends AbstractScoreRuleStrategy {
                     .ruleId(scoreRuleDO.getId())
                     .uniqueId(String.valueOf(userId))
                     .expireDays(scoreRuleDO.getScorePeriod())
+                    .extParam(map)
                     .build());
         } catch (Exception e) {
             log.error("Register listener: operateScore error", e);

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

@@ -89,9 +89,7 @@ public class RewardController {
         PageResult<RewardDO> pageResult = rewardService.getPage(query, page);
         PageResult<RewardBackVO> rewardBackVOPageResult = RewardConvert.INSTANCE.convertPage(pageResult);
         // 转换nodeId和points
-        rewardBackVOPageResult.getList().forEach(rewardBackVO -> {
-            rewardBackVO.getNodeIds().add(new RewardBackVO.NodeAndPoints(rewardBackVO.getNodeId(), rewardBackVO.getPointsRequire()));
-        });
+        rewardBackVOPageResult.getList().forEach(rewardBackVO -> rewardBackVO.getNodeIds().add(new RewardBackVO.NodeAndPoints(rewardBackVO.getNodeId(), rewardBackVO.getPointsRequire())));
         return success(rewardBackVOPageResult);
     }
 

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

@@ -19,6 +19,7 @@ import cn.iocoder.yudao.module.reward.enums.RewardStatusEnum;
 import cn.iocoder.yudao.module.reward.vo.reward.*;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -190,7 +191,7 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
         //礼品ID
         lambdaQuery.eqIfPresent(RewardDO::getCode, query.getCode());
         //礼品名称，模糊匹配三种语言
-        if (query.getTitle() != null) {
+        if (StringUtils.isNotBlank(query.getTitle())) {
             lambdaQuery.and(wrapper ->
                     wrapper.like(RewardDO::getTitleZh, query.getTitle())
                             .or()
@@ -207,10 +208,10 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
         }
         //兑换网点id，领取方式，状态
         lambdaQuery.eqIfPresent(RewardDO::getNodeId, query.getNodeId())
-                .eqIfPresent(RewardDO::getPickMethod, query.getPickMethod())
+                .eq(StringUtils.isNotBlank(query.getPickMethod()), RewardDO::getPickMethod, query.getPickMethod())
                 .eqIfPresent(RewardDO::getStatus, query.getStatus());
         //备注，模糊匹配三种语言
-        if (query.getRemark() != null) {
+        if (StringUtils.isNotBlank(query.getRemark())) {
             lambdaQuery.and(wrapper ->
                     wrapper.like(RewardDO::getRemarkZh, query.getRemark())
                             .or()
@@ -327,9 +328,9 @@ public class RewardServiceImpl extends AbstractService<RewardMapper, RewardDO> i
             List<NodeRespDTO> nodes = null;
             // 如果用户没有填写国家或城市默认展示中国的礼品
             if (user.getCity() == null || user.getCountry() == null) {
-                nodes = nodeApi.getNodesByCity(null,130L);
+                nodes = nodeApi.getNodesByCity(null, 130L);
             } else {
-                nodes = nodeApi.getNodesByCity(user.getCity().longValue(),null);
+                nodes = nodeApi.getNodesByCity(user.getCity().longValue(), null);
             }
             if (CollectionUtil.isNotEmpty(nodes)) {
                 rewardDOLambdaQuery.in(RewardDO::getNodeId, nodes.stream().map(NodeRespDTO::getId).collect(Collectors.toList()));