Merge remote-tracking branch 'origin/康年堂' into 康年堂

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -722,8 +722,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
         }
         String uuid = IdUtil.randomUUID();
-        redisCache.setCacheObject("orderKey:" + uuid, cartParam.getCartIds(), 300, TimeUnit.SECONDS);
-        redisCache.setCacheObject("orderCarts:" + uuid, carts, 300, TimeUnit.SECONDS);
+        redisCache.setCacheObject("orderKey:" + uuid, cartParam.getCartIds(), 2, TimeUnit.DAYS);
+        redisCache.setCacheObject("orderCarts:" + uuid, carts, 2, TimeUnit.DAYS);
         return R.ok().put("orderKey", uuid).put("address", address).put("carts", carts);
 
     }
@@ -4740,7 +4740,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
         String orderId=redisCache.getCacheObject("isPaying:"+order.getId());
         if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getId().toString())){
-            return R.error("正在支付中...");
+            return R.error("请30s后重试...");
         }
         List<FsStorePaymentScrm>  payments=fsStorePaymentMapper.selectFsStorePaymentByOrder(order.getId());
         if(CollectionUtils.isNotEmpty(payments)){

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -324,7 +324,7 @@ public class StoreOrderScrmController extends AppBaseController {
         RLock lock = redissonClient.getLock(String.format(LOCK_KEY_EDIT_PAY_TYPE,orderId));
         R result = null;
         try {
-            boolean locked = lock.tryLock(100, 10000, TimeUnit.MILLISECONDS);
+            boolean locked = lock.tryLock(100, 30000, TimeUnit.MILLISECONDS);
             if (!locked) {
                 logger.warn("订单支付类型正在修改中，获取锁失败, 订单号: {}", orderId);
                 return R.error("订单正在处理中，请勿重复提交");