Commit 965f3d1f by ping.wu

打印日志

parent a69ed155
...@@ -3,6 +3,7 @@ package cn.freemud.manager; ...@@ -3,6 +3,7 @@ package cn.freemud.manager;
import cn.freemud.constant.RedisKeyConstant; import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.enums.OrderType; import cn.freemud.enums.OrderType;
import cn.freemud.enums.OrderTackCodeRuleEnum; import cn.freemud.enums.OrderTackCodeRuleEnum;
import cn.freemud.utils.LogUtil;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule; import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager; import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest; import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
...@@ -52,7 +53,9 @@ public class OrderTackCodeManager { ...@@ -52,7 +53,9 @@ public class OrderTackCodeManager {
String rule = (String) redisTemplate.opsForHash().entries(key).get("rule"); String rule = (String) redisTemplate.opsForHash().entries(key).get("rule");
AssortmentTackCodeRule assortmentTackCodeRule = null; AssortmentTackCodeRule assortmentTackCodeRule = null;
if (Objects.isNull(rule) || rule.isEmpty()) { if (Objects.isNull(rule) || rule.isEmpty()) {
LogUtil.info("queryTackCodeRule1",partnerId,storeId);
assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId); assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId);
LogUtil.info("queryTackCodeRule_end",partnerId,storeId);
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 {
...@@ -63,6 +66,7 @@ public class OrderTackCodeManager { ...@@ -63,6 +66,7 @@ public class OrderTackCodeManager {
} }
if(!Objects.isNull(var1)){var1.setMealCodeRule(rule);} if(!Objects.isNull(var1)){var1.setMealCodeRule(rule);}
if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.RANDOM_NUMBER.getCode()+"")) { if (StringUtils.isNotEmpty(rule) && rule.equals(OrderTackCodeRuleEnum.RANDOM_NUMBER.getCode()+"")) {
LogUtil.info("queryTackCodeRule2",partnerId,storeId);
//6位码 //6位码
String number = generateNumber(6); String number = generateNumber(6);
if (!redisTemplate.opsForHash().hasKey(randomKey, storeId + number)) { if (!redisTemplate.opsForHash().hasKey(randomKey, storeId + number)) {
...@@ -71,10 +75,12 @@ public class OrderTackCodeManager { ...@@ -71,10 +75,12 @@ public class OrderTackCodeManager {
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()+"")) {
LogUtil.info("queryTackCodeRule3",partnerId,storeId);
//规则自定义 //规则自定义
Map<Object, Object> tackCodeSettingMap = redisTemplate.opsForHash().entries(randomKey); Map<Object, Object> tackCodeSettingMap = redisTemplate.opsForHash().entries(randomKey);
if (tackCodeSettingMap.isEmpty()) { if (tackCodeSettingMap.isEmpty()) {
if (Objects.isNull(assortmentTackCodeRule)) { if (Objects.isNull(assortmentTackCodeRule)) {
LogUtil.info("queryTackCodeRule4",partnerId,storeId);
assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId); assortmentTackCodeRule = assortmentTackCodeRuleManager.queryTackCodeRule(partnerId);
} }
initTackCodeSettingHash(assortmentTackCodeRule,randomKey,tackCodeSettingMap); initTackCodeSettingHash(assortmentTackCodeRule,randomKey,tackCodeSettingMap);
...@@ -100,6 +106,7 @@ public class OrderTackCodeManager { ...@@ -100,6 +106,7 @@ public class OrderTackCodeManager {
} }
return head + code; return head + code;
} else { } else {
LogUtil.info("queryTackCodeRule5",partnerId,storeId);
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)));
redisTemplate.expire(key, 24, TimeUnit.HOURS); redisTemplate.expire(key, 24, TimeUnit.HOURS);
......
...@@ -558,7 +558,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -558,7 +558,9 @@ public class OrderServiceImpl implements Orderservice {
if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) { if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) {
var1.setNotAutomaticTwistTime(notAutomaticTwistTime); var1.setNotAutomaticTwistTime(notAutomaticTwistTime);
} }
LogUtil.info("generateTackCode_start",orderBean.getOid(),storeId);
String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc()); String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
LogUtil.info("generateTackCode_end",orderBean.getOid(),storeId);
var1.setPickUpGoodsNo(pickUpGoodsNo); var1.setPickUpGoodsNo(pickUpGoodsNo);
// 订单支付成功 // 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1); com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(var1);
......
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