Merge branch 'feature/2.0.6-农工商商品兑换券' into develop

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

@@ -57,6 +57,7 @@ import com.freemud.sdk.api.assortment.order.request.order.ProductBindingCouponTy
 import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
 import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
+import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
@@ -108,7 +109,7 @@ public class SellCouponOrderServiceImpl {
     @Autowired
     private OrderSdkAdapter orderSdkAdapter;
     @Autowired
-    private static RedisTemplate redisTemplate;
+    private RedisCache redisCache;
     @Autowired
     private CouponService couponService;
 
@@ -286,6 +287,7 @@ public class SellCouponOrderServiceImpl {
         String key = this.getFolwNo(partnerId, date);
 /*
         int flowno = 0;
+        RedisTemplate redisTemplate = redisCache.getRedisTemplate();
 
         if (redisTemplate.opsForValue().setIfAbsent(key, 0)) {
             redisTemplate.expire(key, 24, TimeUnit.HOURS);