完善链接新增Ipad加好友接口

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -54,7 +54,9 @@ import com.fs.huifuPay.domain.HuifuConfirmrefundResult;
 import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentDelaytransConfirmrefundRequest;
 import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentScanpayRefundRequest;
 import com.fs.huifuPay.service.HuiFuService;
+import com.fs.qw.domain.QwExternalContact;
 import com.fs.qw.mapper.FsUserInformationCollectionScheduleMapper;
+import com.fs.qw.mapper.QwExternalContactMapper;
 import com.fs.store.domain.FsDoctorConfirm;
 import com.fs.store.service.IFsDoctorConfirmService;
 import com.fs.system.domain.SysConfig;
@@ -187,6 +189,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     @Autowired
     private IFsUserService userService;
 
+    @Autowired
+    private QwExternalContactMapper qwExternalContactMapper;
+
 
 
     /**
@@ -630,8 +635,17 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
     public FsUserInfoCollectionUVO info(Long id,Long userId) {
         FsUserInformationCollection selectByUserId = fsUserInformationCollectionMapper.selectByUserId(userId);
         if (selectByUserId != null) {
+            //查询此用户是否添加该销售企微好友,未添加提示添加销售
+            QwExternalContact externalContactCondition=new QwExternalContact();
+            externalContactCondition.setFsUserId(userId);
+            externalContactCondition.setCompanyUserId(selectByUserId.getCompanyUserId());
+            List<QwExternalContact> qwExternalContacts = qwExternalContactMapper.selectQwExternalContactList(externalContactCondition);
+            if (CollectionUtils.isEmpty(qwExternalContacts)){
+                log.error("客户二次提交采集信息,销售与分享客户之间没有企微好友关系,当前销售id:{},当前客户id:{}",selectByUserId.getCompanyUserId(),userId);
+                throw new CustomException("请添加分享销售企微好友！");
+            }
             if (!selectByUserId.getId().equals(id)) {
-                throw new CustomException("已有信息采集信息！");
+                throw new CustomException("已有信息采集信息！,请联系销售重新分享二维码！");
             }
         }
         FsUserInfoCollectionUVO vo = new FsUserInfoCollectionUVO();
@@ -1345,6 +1359,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 fsUserInformationCollectionMapper.updateFsUserInformationCollection(informationCollection);
 
                 FsUserInformationCollectionSchedule schedule = scheduleMapper.selectCollectionScheduleRunningByCollectionId(informationCollection.getId());
+                if (schedule == null) {
+                    throw new CustomException("用户采集信息已更新,请扫描最新二维码确认");
+                }
                 //设置填写时间
                 schedule.setFillTime(DateUtils.getNowDate());
                 result=scheduleMapper.updateFsUserInformationCollectionSchedule(schedule);