益寿缘-优化用户二次确认逻辑

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -700,6 +700,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     return R.error("联系销售添加默认收货地址");
                 }
             }
+            if(collection.getStatus()!=null&&collection.getStatus()==2){
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                logger.info("订单已创建!,采集信息collectionId:{},订单id：{}",collection.getId(),collection.getPackageOrderCode());
+                return R.ok();
+            }
         }
 
 
@@ -769,13 +774,6 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 return R.error("超过限购次数");
             }
         }
-        if (collection != null){
-            if(collection.getStatus()!=null&&collection.getStatus()==2){
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                logger.info("订单已创建!,采集信息collectionId:{},订单id：{}",collection.getId(),collection.getPackageOrderCode());
-                return R.ok();
-            }
-        }
         FsPackageOrder  order=new FsPackageOrder();
         String orderSn =  OrderCodeUtils.getOrderSn();
         if(StringUtils.isEmpty(orderSn)){