Merge branches 'feature/20210707_wuping' and…

Merge branches 'feature/20210707_wuping' and 'feature/20210715_购物车可用优惠券改造_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210715_购物车可用优惠券改造_wuping

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

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

@@ -3,6 +3,7 @@ package cn.freemud.manager;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.entities.dto.product.ProductInfo;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.redis.RedisCache;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -21,11 +22,15 @@ import java.util.stream.Collectors;
  */
 @Component
 public class BuyProductOnceManager {
+//    @Autowired
+//    protected RedisTemplate redisTemplate;
+
     @Autowired
-    protected RedisTemplate redisTemplate;
+    private RedisCache redisCache;
 
     //用户限购：每人每单限购一次 / 禁用
     public ResponseResult checkBuyProductOnce(List<ProductInfo> products, String partnerId, String userId) {
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
         List<ProductInfo> productsCheck = products.stream().filter(product -> product.getIsLimitNumProduct() == 1).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(productsCheck)) {
             //每人每单限购一次
@@ -55,6 +60,7 @@ public class BuyProductOnceManager {
 
     //清掉key
     public boolean removeCheckBuyProductOnceKey(String partnerId, String userId,String pid) {
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
         String key = this.getCheckBuyProductOnceKey(partnerId, userId,pid);
         redisTemplate.delete(key);
         return true;

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

@@ -3,6 +3,7 @@ package cn.freemud.manager;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.enums.OrderTackCodeRuleEnum;
 import cn.freemud.enums.OrderType;
+import cn.freemud.redis.RedisCache;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
 import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
 import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
@@ -29,8 +30,12 @@ import java.util.function.Function;
 public class OrderTackCodeManager {
     @Autowired
     private AssortmentTackCodeRuleManager assortmentTackCodeRuleManager;
+
+
+//    @Autowired
+//    protected RedisTemplate redisTemplate;
     @Autowired
-    protected RedisTemplate redisTemplate;
+    private RedisCache redisCache;
 
     public final static String numberChar = "0123456789";
 
@@ -46,6 +51,7 @@ public class OrderTackCodeManager {
      * @return
      */
     public String generateTackCode(Integer orderType, String partnerId, String storeId, ConfirmOrderRequest var1, Function<Integer, String> fun) {
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
         String key = this.getOrderTackCodeKey(partnerId);
         String randomKey = getRandomOrderTackCodeKey(partnerId, storeId);
         String rule = (String) redisTemplate.opsForHash().entries(key).get("rule");
@@ -168,6 +174,7 @@ public class OrderTackCodeManager {
     }
 
     private void initTackCodeSettingHash(AssortmentTackCodeRule assortmentTackCodeRule,String randomKey, Map<Object, Object> tackCodeSettingMap){
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
         tackCodeSettingMap.put("eatInHead", assortmentTackCodeRule.getEatInHead());
         tackCodeSettingMap.put("eatInCode", Integer.valueOf(assortmentTackCodeRule.getEatInCode()));
         tackCodeSettingMap.put("eatInLength", assortmentTackCodeRule.getEatInCode().length());