调整取餐码起始规则

order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java

@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
@@ -36,6 +37,8 @@ public class OrderTackCodeManager {
 
     public final static String numberCharWithoutZero = "12345";
 
+
+
     /**
      * 生成取餐码
      *
@@ -176,13 +179,13 @@ public class OrderTackCodeManager {
 
     private void initTackCodeSettingHash(AssortmentTackCodeRule assortmentTackCodeRule,String randomKey, Map<Object, Object> tackCodeSettingMap){
         tackCodeSettingMap.put("eatInHead", assortmentTackCodeRule.getEatInHead());
-        tackCodeSettingMap.put("eatInCode", assortmentTackCodeRule.getEatInCode());
+        tackCodeSettingMap.put("eatInCode", Integer.valueOf(assortmentTackCodeRule.getEatInCode()));
         tackCodeSettingMap.put("eatInLength", assortmentTackCodeRule.getEatInCode().length());
         tackCodeSettingMap.put("collectGoodsHead", assortmentTackCodeRule.getCollectGoodsHead());
-        tackCodeSettingMap.put("collectGoodsCode", assortmentTackCodeRule.getCollectGoodsCode());
+        tackCodeSettingMap.put("collectGoodsCode", Integer.valueOf(assortmentTackCodeRule.getCollectGoodsCode()));
         tackCodeSettingMap.put("collectGoodsLength", assortmentTackCodeRule.getCollectGoodsCode().length());
         tackCodeSettingMap.put("takeOutHead", assortmentTackCodeRule.getTakeOutHead());
-        tackCodeSettingMap.put("takeOutCode", assortmentTackCodeRule.getTakeOutCode());
+        tackCodeSettingMap.put("takeOutCode", Integer.valueOf(assortmentTackCodeRule.getTakeOutCode()));
         tackCodeSettingMap.put("takeOutLength", assortmentTackCodeRule.getTakeOutCode().length());
         redisTemplate.opsForHash().putAll(randomKey, tackCodeSettingMap);
         redisTemplate.expire(randomKey, 24, TimeUnit.HOURS);

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -334,6 +334,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private ActivityHandle activityHandle;
 
+    @Autowired
+    private OrderTackCodeManager orderTackCodeManager;
+
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
@@ -479,8 +482,7 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
-    @Autowired
-    private OrderTackCodeManager orderTackCodeManager;
+
 
     @Override
     public String paySuccessCallback(PaysuccessNoticeMessage message, ConfirmOrderDto confirmOrderDto, Map<String, QueryOrdersResponseDto.DataBean.OrderBean> orderBeans) {