Commit f448aec5 by hanghang.wang

调整取餐码起始规则

parent bf0faadb
...@@ -49,9 +49,7 @@ public class OrderTackCodeManager { ...@@ -49,9 +49,7 @@ public class OrderTackCodeManager {
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(randomKey);
String rule = (String) redisTemplate.opsForHash().entries(key).get("rule"); String rule = (String) redisTemplate.opsForHash().entries(key).get("rule");
log.info("tackCode rule1 : " + 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);
...@@ -76,13 +74,10 @@ public class OrderTackCodeManager { ...@@ -76,13 +74,10 @@ public class OrderTackCodeManager {
} 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("tackCode rule3 : " + assortmentTackCodeRule );
if (tackCodeSettingMap.isEmpty()) { if (tackCodeSettingMap.isEmpty()) {
if (Objects.isNull(assortmentTackCodeRule)) { if (Objects.isNull(assortmentTackCodeRule)) {
// log.info("tackCode rule4 : " + assortmentTackCodeRule );
assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId); assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId);
} }
// log.info("tackCode rule5 : " + assortmentTackCodeRule );
initTackCodeSettingHash(assortmentTackCodeRule,randomKey,tackCodeSettingMap); initTackCodeSettingHash(assortmentTackCodeRule,randomKey,tackCodeSettingMap);
} }
//判断订单类型 //判断订单类型
...@@ -104,7 +99,6 @@ public class OrderTackCodeManager { ...@@ -104,7 +99,6 @@ public class OrderTackCodeManager {
} }
code = String.format("%0" + length + "d", Integer.parseInt(code)); code = String.format("%0" + length + "d", Integer.parseInt(code));
} }
log.info("tackCode rule7 : " + head + code );
return head + code; return head + code;
} else { } else {
......
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