|
|
@@ -686,11 +686,13 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
|
|
|
if (collection.getIsPackage() == 1 && !(collection.getAmount().compareTo(new BigDecimal(0))==1) && collection.getPayType() == 2) {
|
|
|
FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleByCollectionId(collection.getId());
|
|
|
if (schedule != null&&schedule.getStatus() != 1) {
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
//没有进行中的进度 抛出提示信息
|
|
|
return R.error("用户采集信息已更新,请联系销售");
|
|
|
}
|
|
|
address = userAddressService.selectFsUserAddressByDefault(param.getUserId());
|
|
|
if (address == null) {
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return R.error("联系销售添加默认收货地址");
|
|
|
}
|
|
|
}
|