Merge branch 'release-feat-zhangfeng' into 'release'

Release feat zhangfeng

See merge request !21

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/redis/scoreRule/ScoreRuleRedisDao.java

@@ -37,6 +37,7 @@ public class ScoreRuleRedisDao {
     }
 
     public ScoreRuleDO getEnableScoreRule(ScoreRuleTypeEnum type, TransportTypeEnum transportType) {
+        ScoreRuleDO useScoreRuleDO;
         // 如果transportType不为空则是订单V值类型
         if (transportType == null) {
             String redisKey = formatKey(type.getValue(), null);
@@ -44,15 +45,20 @@ public class ScoreRuleRedisDao {
             if (scoreRuleJson == null) {
                 return null;
             }
-            return JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class);
+            useScoreRuleDO = JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class);
         } else {
             String redisKey = formatKey(type.getValue(), transportType.getValue());
             String scoreRuleJson = stringRedisTemplate.opsForValue().get(redisKey);
             if (scoreRuleJson == null) {
                 return null;
             }
-            return JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class);
+            useScoreRuleDO = JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class);
         }
+        // 如果当前时间不在规则时间区间
+        if (System.currentTimeMillis() < useScoreRuleDO.getStartTime().getTime() || System.currentTimeMillis() > useScoreRuleDO.getEndTime().getTime()) {
+            return null;
+        }
+        return useScoreRuleDO;
     }
 
     public ScoreRuleDO getEnableScoreRule(ScoreRuleTypeEnum type) {
@@ -72,7 +78,7 @@ public class ScoreRuleRedisDao {
         scoreRuleDO.setDescZh(null);
         if (scoreRuleDO.getType() == ScoreRuleTypeEnum.ORDER_V.getValue()) {
             ScoreRuleOrderVExtraVO scoreRuleOrderVExtraVO = JsonUtils.parseObject(scoreRuleDO.getExtra(), ScoreRuleOrderVExtraVO.class);
-            stringRedisTemplate.opsForValue().set(formatKey(scoreRuleDO.getType(), scoreRuleOrderVExtraVO.getTransportType()), JsonUtils.toJsonString(scoreRuleDO));
+            stringRedisTemplate.opsForValue().set(formatKey(scoreRuleDO.getType(), scoreRuleOrderVExtraVO.getTransportType()), JsonUtils.toJsonString(scoreRuleDO), 24L, TimeUnit.HOURS);
         }
         stringRedisTemplate.opsForValue().set(formatKey(scoreRuleDO.getType(), null), JsonUtils.toJsonString(scoreRuleDO), 24L, TimeUnit.HOURS);
     }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/util/ScoreRuleGenCodeUtils.java

@@ -65,6 +65,7 @@ public class ScoreRuleGenCodeUtils {
             }
         }
         // 获得5位序列号，不足位前面补0
+        codeNum = codeNum % 100000;
         code.append(String.format("%05d", codeNum));
         return code.toString();
     }

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

@@ -40,7 +40,7 @@
 
     <sql id="pageCondition">
         <if test="query.key !=null and query.key != ''">
-            and (mu.nickname like '%${query.key}%' or mu.mobile like '%${query.key}%')
+            and (mu.nickname like '%${query.key}%' or mu.mobile like '%${query.key}%' or mu.code like '%${query.key}%')
         </if>
         <if test="query.sourceType !=null">
             and musl.source_type = #{query.sourceType}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/util/RewardGenCodeUtils.java

@@ -65,6 +65,7 @@ public class RewardGenCodeUtils {
             }
         }
         // 获得5位序列号，不足位前面补0
+        codeNum = codeNum % 100000;
         code.append(String.format("%05d", codeNum));
         return code.toString();
     }
@@ -103,6 +104,7 @@ public class RewardGenCodeUtils {
             }
         }
         // 获得5位序列号，不足位前面补0
+        codeNum = codeNum % 100000;
         code.append(String.format("%05d", codeNum));
         return code.toString();
     }

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageReqVO.java

@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam {
     private String rewardTitle;
     @ApiModelProperty(value = "会员名称")
     private String memberName;
+    @ApiModelProperty(value = "会员编号")
+    private String memberCode;
     @ApiModelProperty(value = "领取方式")
     private Integer redeemType;
     @ApiModelProperty(value = "状态")

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java

@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
     private String memberNameZh;
     @ApiModelProperty(value = "会员名称英文")
     private String memberNameEn;
+    @ApiModelProperty(value = "会员编号")
+    private String memberCode;
     @ApiModelProperty(value = "礼品ID")
     private String rewardCode;
     @ApiModelProperty(value = "礼品名称（中文）")

yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml

@@ -109,6 +109,7 @@
         err.verify_time as verifyTime,
         mu.nickname as memberNameZh,
         mu.english_name as memberNameEn,
+        mu.code as memberCode,
         er.code as rewardCode,
         er.title_zh as rewardTitleZh,
         er.title_en as rewardTitleEn,
@@ -130,6 +131,9 @@
         <if test="req.memberName != null and req.memberName !=''">
             and mu.nickname like '%${req.memberName}%'
         </if>
+        <if test="req.memberCode != null and req.memberCode !=''">
+            and mu.code = #{req.memberCode}
+        </if>
         <if test="req.rewardCode != null and req.rewardCode !=''">
             and er.code like '%${req.rewardCode}%'
         </if>