|
|
@@ -699,11 +699,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return R.error("联系销售添加默认收货地址");
|
|
|
}
|
|
|
- }
|
|
|
- if(collection.getStatus()!=null&&collection.getStatus()==2){
|
|
|
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
- logger.info("订单已创建!,采集信息collectionId:{},订单id:{}",collection.getId(),collection.getPackageOrderCode());
|
|
|
- return R.ok();
|
|
|
+ if(collection.getStatus()!=null&&collection.getStatus()==2){
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ logger.info("订单已创建!,采集信息collectionId:{},订单id:{}",collection.getId(),collection.getPackageOrderCode());
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|