Commit ac74974c authored by zhangfeng's avatar zhangfeng

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

Release feat zhangfeng

See merge request !21
parents 9c3b8c01 30b6cd7e
...@@ -37,6 +37,7 @@ public class ScoreRuleRedisDao { ...@@ -37,6 +37,7 @@ public class ScoreRuleRedisDao {
} }
public ScoreRuleDO getEnableScoreRule(ScoreRuleTypeEnum type, TransportTypeEnum transportType) { public ScoreRuleDO getEnableScoreRule(ScoreRuleTypeEnum type, TransportTypeEnum transportType) {
ScoreRuleDO useScoreRuleDO;
// 如果transportType不为空则是订单V值类型 // 如果transportType不为空则是订单V值类型
if (transportType == null) { if (transportType == null) {
String redisKey = formatKey(type.getValue(), null); String redisKey = formatKey(type.getValue(), null);
...@@ -44,15 +45,20 @@ public class ScoreRuleRedisDao { ...@@ -44,15 +45,20 @@ public class ScoreRuleRedisDao {
if (scoreRuleJson == null) { if (scoreRuleJson == null) {
return null; return null;
} }
return JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class); useScoreRuleDO = JsonUtils.parseObject(scoreRuleJson, ScoreRuleDO.class);
} else { } else {
String redisKey = formatKey(type.getValue(), transportType.getValue()); String redisKey = formatKey(type.getValue(), transportType.getValue());
String scoreRuleJson = stringRedisTemplate.opsForValue().get(redisKey); String scoreRuleJson = stringRedisTemplate.opsForValue().get(redisKey);
if (scoreRuleJson == null) { if (scoreRuleJson == null) {
return 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) { public ScoreRuleDO getEnableScoreRule(ScoreRuleTypeEnum type) {
...@@ -72,7 +78,7 @@ public class ScoreRuleRedisDao { ...@@ -72,7 +78,7 @@ public class ScoreRuleRedisDao {
scoreRuleDO.setDescZh(null); scoreRuleDO.setDescZh(null);
if (scoreRuleDO.getType() == ScoreRuleTypeEnum.ORDER_V.getValue()) { if (scoreRuleDO.getType() == ScoreRuleTypeEnum.ORDER_V.getValue()) {
ScoreRuleOrderVExtraVO scoreRuleOrderVExtraVO = JsonUtils.parseObject(scoreRuleDO.getExtra(), ScoreRuleOrderVExtraVO.class); 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); stringRedisTemplate.opsForValue().set(formatKey(scoreRuleDO.getType(), null), JsonUtils.toJsonString(scoreRuleDO), 24L, TimeUnit.HOURS);
} }
......
...@@ -65,6 +65,7 @@ public class ScoreRuleGenCodeUtils { ...@@ -65,6 +65,7 @@ public class ScoreRuleGenCodeUtils {
} }
} }
// 获得5位序列号,不足位前面补0 // 获得5位序列号,不足位前面补0
codeNum = codeNum % 100000;
code.append(String.format("%05d", codeNum)); code.append(String.format("%05d", codeNum));
return code.toString(); return code.toString();
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<sql id="pageCondition"> <sql id="pageCondition">
<if test="query.key !=null and query.key != ''"> <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>
<if test="query.sourceType !=null"> <if test="query.sourceType !=null">
and musl.source_type = #{query.sourceType} and musl.source_type = #{query.sourceType}
......
...@@ -65,6 +65,7 @@ public class RewardGenCodeUtils { ...@@ -65,6 +65,7 @@ public class RewardGenCodeUtils {
} }
} }
// 获得5位序列号,不足位前面补0 // 获得5位序列号,不足位前面补0
codeNum = codeNum % 100000;
code.append(String.format("%05d", codeNum)); code.append(String.format("%05d", codeNum));
return code.toString(); return code.toString();
} }
...@@ -103,6 +104,7 @@ public class RewardGenCodeUtils { ...@@ -103,6 +104,7 @@ public class RewardGenCodeUtils {
} }
} }
// 获得5位序列号,不足位前面补0 // 获得5位序列号,不足位前面补0
codeNum = codeNum % 100000;
code.append(String.format("%05d", codeNum)); code.append(String.format("%05d", codeNum));
return code.toString(); return code.toString();
} }
......
...@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam { ...@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam {
private String rewardTitle; private String rewardTitle;
@ApiModelProperty(value = "会员名称") @ApiModelProperty(value = "会员名称")
private String memberName; private String memberName;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "领取方式") @ApiModelProperty(value = "领取方式")
private Integer redeemType; private Integer redeemType;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
......
...@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO { ...@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
private String memberNameZh; private String memberNameZh;
@ApiModelProperty(value = "会员名称英文") @ApiModelProperty(value = "会员名称英文")
private String memberNameEn; private String memberNameEn;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "礼品ID") @ApiModelProperty(value = "礼品ID")
private String rewardCode; private String rewardCode;
@ApiModelProperty(value = "礼品名称(中文)") @ApiModelProperty(value = "礼品名称(中文)")
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
err.verify_time as verifyTime, err.verify_time as verifyTime,
mu.nickname as memberNameZh, mu.nickname as memberNameZh,
mu.english_name as memberNameEn, mu.english_name as memberNameEn,
mu.code as memberCode,
er.code as rewardCode, er.code as rewardCode,
er.title_zh as rewardTitleZh, er.title_zh as rewardTitleZh,
er.title_en as rewardTitleEn, er.title_en as rewardTitleEn,
...@@ -130,6 +131,9 @@ ...@@ -130,6 +131,9 @@
<if test="req.memberName != null and req.memberName !=''"> <if test="req.memberName != null and req.memberName !=''">
and mu.nickname like '%${req.memberName}%' and mu.nickname like '%${req.memberName}%'
</if> </if>
<if test="req.memberCode != null and req.memberCode !=''">
and mu.code = #{req.memberCode}
</if>
<if test="req.rewardCode != null and req.rewardCode !=''"> <if test="req.rewardCode != null and req.rewardCode !=''">
and er.code like '%${req.rewardCode}%' and er.code like '%${req.rewardCode}%'
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment