Commit 91b6c184 by hanghang.wang

去掉日志

parent 8b2d667b
...@@ -47,19 +47,12 @@ public class OrderTackCodeManager { ...@@ -47,19 +47,12 @@ public class OrderTackCodeManager {
* @return * @return
*/ */
public String generateTackCode(Integer orderType, String partnerId, String storeId, ConfirmOrderRequest var1, Function<Integer, String> fun) { public String generateTackCode(Integer orderType, String partnerId, String storeId, ConfirmOrderRequest var1, Function<Integer, String> fun) {
String key = this.getOrderTackCodeKey(partnerId); String key = this.getOrderTackCodeKey(partnerId);
String randomKey = getRandomOrderTackCodeKey(partnerId, storeId); String randomKey = getRandomOrderTackCodeKey(partnerId, storeId);
redisTemplate.delete(key);
redisTemplate.delete(randomKey);
String rule = (String) redisTemplate.opsForHash().entries(key).get("rule"); String rule = (String) redisTemplate.opsForHash().entries(key).get("rule");
log.info("assortmentTackCodeRule 1 key:" + key +" randomKey:"+ randomKey +" rule:"+ rule);
AssortmentTackCodeRule assortmentTackCodeRule = null; AssortmentTackCodeRule assortmentTackCodeRule = null;
if (Objects.isNull(rule) || rule.isEmpty()) { if (Objects.isNull(rule) || rule.isEmpty()) {
assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId); assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId);
log.info("assortmentTackCodeRule 2 :"+ assortmentTackCodeRule);
if (Objects.isNull(assortmentTackCodeRule)) { if (Objects.isNull(assortmentTackCodeRule)) {
rule = String.valueOf(OrderTackCodeRuleEnum.RANDOM_NUMBER_ONE.getCode()); rule = String.valueOf(OrderTackCodeRuleEnum.RANDOM_NUMBER_ONE.getCode());
} else { } else {
...@@ -67,10 +60,8 @@ public class OrderTackCodeManager { ...@@ -67,10 +60,8 @@ public class OrderTackCodeManager {
} }
redisTemplate.opsForHash().put(key, "rule", rule); redisTemplate.opsForHash().put(key, "rule", rule);
redisTemplate.expire(key, 24, TimeUnit.HOURS); redisTemplate.expire(key, 24, TimeUnit.HOURS);
log.info("assortmentTackCodeRule 3 :"+ rule);
} }
if(!Objects.isNull(var1)){var1.setMealCodeRule(rule);} if(!Objects.isNull(var1)){var1.setMealCodeRule(rule);}
log.info("assortmentTackCodeRule 4 :"+ rule);
if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.RANDOM_NUMBER.getCode()+"")) { if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.RANDOM_NUMBER.getCode()+"")) {
//6位码 //6位码
String number = generateNumber(6); String number = generateNumber(6);
...@@ -79,11 +70,9 @@ public class OrderTackCodeManager { ...@@ -79,11 +70,9 @@ public class OrderTackCodeManager {
redisTemplate.expire(randomKey, getSecondsNextEarlyMorning(), TimeUnit.SECONDS); redisTemplate.expire(randomKey, getSecondsNextEarlyMorning(), TimeUnit.SECONDS);
return number; return number;
} }
} else if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.THE_CUSTOM.getCode()+"")) { } else if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.THE_CUSTOM.getCode()+"")) {
//规则自定义 //规则自定义
Map<Object, Object> tackCodeSettingMap = redisTemplate.opsForHash().entries(randomKey); Map<Object, Object> tackCodeSettingMap = redisTemplate.opsForHash().entries(randomKey);
log.info("assortmentTackCodeRule 5 :"+ tackCodeSettingMap);
if (tackCodeSettingMap.isEmpty()) { if (tackCodeSettingMap.isEmpty()) {
if (Objects.isNull(assortmentTackCodeRule)) { if (Objects.isNull(assortmentTackCodeRule)) {
assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId); assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId);
...@@ -93,7 +82,6 @@ public class OrderTackCodeManager { ...@@ -93,7 +82,6 @@ public class OrderTackCodeManager {
//判断订单类型 //判断订单类型
String head = "",code = ""; String head = "",code = "";
OrderType orderTypeEnum = OrderType.getByCode(orderType); OrderType orderTypeEnum = OrderType.getByCode(orderType);
log.info("assortmentTackCodeRule 6 :"+ tackCodeSettingMap);
if(!Objects.isNull(orderTypeEnum)){ if(!Objects.isNull(orderTypeEnum)){
String tackDesc = orderTypeEnum.getTackDesc(); String tackDesc = orderTypeEnum.getTackDesc();
head = tackCodeSettingMap.get(tackDesc+"Head").toString(); head = tackCodeSettingMap.get(tackDesc+"Head").toString();
...@@ -111,7 +99,6 @@ public class OrderTackCodeManager { ...@@ -111,7 +99,6 @@ public class OrderTackCodeManager {
code = String.format("%0" + length + "d", Integer.parseInt(code)); code = String.format("%0" + length + "d", Integer.parseInt(code));
} }
return head + code; return head + code;
} else { } else {
if (!redisTemplate.opsForHash().hasKey(key, storeId)) { if (!redisTemplate.opsForHash().hasKey(key, storeId)) {
redisTemplate.opsForHash().put(key, storeId, Integer.parseInt(generateNumber(4))); redisTemplate.opsForHash().put(key, storeId, Integer.parseInt(generateNumber(4)));
......
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