Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into develop

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

@@ -68,7 +68,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
     /**
      * 创单锁定的key
      */
-    @Value("${create.order.key.expire}")
+    @Value("${create.order.key.expire:5}")
     private String createOrderKeyExpire;
 
     @Autowired
@@ -151,7 +151,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
         // 锁定秒数从apollo获取，如果apollo没有设置，默认5秒
         String createOrderKey = CREATE_ORDER_KEY + assortmentCustomerInfoVo.getMemberId();
         try {
-            Long expire = StringUtils.isNotBlank(createOrderKeyExpire) ? Long.valueOf(createOrderKeyExpire) : 5L;
+            Long expire = Long.valueOf(createOrderKeyExpire);
             if(!LockUtils.lock(redisCache.getRedisTemplate(),createOrderKey,expire)){
                 return ResponseUtil.error(ResponseResult.ORDER_NOT_CREATE_ERROR);
             }