|
@@ -769,7 +769,13 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
|
|
|
return R.error("超过限购次数");
|
|
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();
|
|
FsPackageOrder order=new FsPackageOrder();
|
|
|
String orderSn = OrderCodeUtils.getOrderSn();
|
|
String orderSn = OrderCodeUtils.getOrderSn();
|
|
|
if(StringUtils.isEmpty(orderSn)){
|
|
if(StringUtils.isEmpty(orderSn)){
|