change

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

@@ -58,6 +58,8 @@ import com.fs.huifuPay.domain.HuifuOrderConfirm;
 import com.fs.huifuPay.domain.HuifuOrderConfirmResult;
 import com.fs.huifuPay.sdk.opps.core.utils.DateTools;
 import com.fs.huifuPay.service.HuiFuService;
+import com.fs.qw.mapper.FsUserInformationCollectionScheduleMapper;
+import com.fs.qw.service.IFsUserInformationCollectionScheduleService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
@@ -187,6 +189,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 
     @Autowired
     private IFsDoctorService iFsDoctorService;
+
+    @Autowired
+    private FsUserInformationCollectionScheduleMapper scheduleMapper;
     /**
      * 查询套餐订单
      *
@@ -677,7 +682,13 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         }
         FsUserInformationCollection collection = userInformationCollectionMapper.selectFsUserInformationCollectionById(param.getCollectionId());
         if (collection != null) {
+
             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) {
+                    //没有进行中的进度 抛出提示信息
+                    return R.error("用户采集信息已更新，请扫描最新二维码确认");
+                }
                 address = userAddressService.selectFsUserAddressByDefault(param.getUserId());
                 if (address == null) {
                     return R.error("联系销售添加默认收货地址");