From 034f721532353d1d4a1ee3f3fa631d76f496898d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 02 四月 2024 16:02:28 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 1369 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 1,281 insertions(+), 88 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index f3e2e61..ebd3268 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -15,6 +16,7 @@
 import com.doumee.dao.business.dto.CountCyclePriceDTO;
 import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
 import com.doumee.dao.business.dto.InsuranceApplyQueryDTO;
+import com.doumee.dao.business.dto.SmsCheckDTO;
 import com.doumee.dao.business.join.*;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.business.vo.CountCyclePriceVO;
@@ -40,6 +42,7 @@
 
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -98,6 +101,10 @@
 
     @Autowired
     private NoticesMapper noticesMapper;
+    @Autowired
+    private UnionApplyJoinMapper unionApplyJoinMapper;
+    @Autowired
+    private UnionChangeJoinMapper unionChangeJoinMapper;
 
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -133,7 +140,9 @@
         //瀛樺偍寰呭姙淇℃伅
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
         //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                .eq(Notices::getObjId,insuranceApply.getId()));
         Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
                 model.getCompanyId(), Constants.NoticeType.FOUR);
         noticesMapper.insert(notices);
@@ -146,6 +155,39 @@
         applyLogMapper.insert(log);
         return  1;
 
+    }
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer closeWtbForShop(InsuranceApply insuranceApply) {
+        if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
+
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        //鍙湁瀹℃牳閫氳繃鐨勭姸鎬佸彲鍏抽棴
+        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        InsuranceApply update = new InsuranceApply();
+        update.setEditDate(new Date());
+        update.setEditor(user.getId());
+        update.setStatus(Constants.InsuranceApplyStatus.WTB_CLOSED.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo(insuranceApply.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        insuranceApplyMapper.updateById(update);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SHOP_CLOSE_WTB_APPLY;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", update.getCheckInfo());
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+        return  1;
     }
 
     @Override
@@ -186,6 +228,19 @@
         update.setStartTime(insuranceApply.getStartTime());
         insuranceApplyMapper.updateById(update);
 
+        //淇敼鏄庣粏琛岀殑寮�濮嬬粨鏉熸棩鏈�
+        applyDetailMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda().set(ApplyDetail::getStartTime,insuranceApply.getStartTime())
+                .set(ApplyDetail::getEndTime,actEndTime).eq(ApplyDetail::getApplyId,model.getId()));
+
+        multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjType,Constants.MultiFile.BD_DONE_PDF.getKey())
+                .eq(Multifile::getObjId,update.getId())
+                .set(Multifile::getIsdeleted,Constants.ONE)
+                .set(Multifile::getEditDate,update.getEditDate())
+                .set(Multifile::getEditor,update.getEditor())
+        );
+
         insuranceApply.getBaoxiandanFile().setIsdeleted(Constants.ZERO);
         insuranceApply.getBaoxiandanFile().setCreator(user.getId());
         insuranceApply.getBaoxiandanFile().setObjId(update.getId());
@@ -199,7 +254,7 @@
         String info = "";
         if(model.getApplyStartTime()!=null && model.getApplyStartTime().getTime()/1000!= insuranceApply.getStartTime().getTime()/1000){
             info =applyLogType.getInfo();
-            info = info.replace("${param1}",DateUtil.getPlusTime2(model.getApplyEndTime()));
+            info = info.replace("${param1}",DateUtil.getPlusTime2(model.getStartTime()));
             info = info.replace("${param2}",DateUtil.getPlusTime2(insuranceApply.getStartTime()));
         }
         ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
@@ -229,14 +284,15 @@
             List<MemberInsurance> memberInsuranceList = new ArrayList<>();
             for (ApplyDetail applyDetail:applyDetailList) {
                 MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
+                memberInsurance.setRelationType(Constants.ZERO);
                 memberInsuranceList.add(memberInsurance);
             }
             memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
         }
 
         return  1;
-
     }
+
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public     Integer editBaoxiandan(InsuranceApply param) {
@@ -267,6 +323,13 @@
         update.setId(model.getId());
         update.setCode(param.getCode());
         insuranceApplyMapper.updateById(update);
+        //淇敼鍛樺伐淇濆崟璁板綍
+        memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>()
+                        .lambda()
+                .set(MemberInsurance::getBdCode,param.getCode())
+                .eq(MemberInsurance::getApplyId,model.getId())
+        );
+
         //鍒犻櫎鍘熸湁鐨勪繚鍗曚俊鎭�
         multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
                 .set(Multifile::getIsdeleted,Constants.ZERO)
@@ -309,13 +372,25 @@
         InsuranceApply update = new InsuranceApply();
         if(insuranceApply.getDealBackApply() ==1){
             //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
-            if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
+            if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())||
+                Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())||
+                Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())||
+                    Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS.getKey()))
+            ){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
             }
             applyLogType = Constants.ApplyLogType.PLATFORM_UN_AGREE_BACK;
             info = applyLogType.getInfo();
             info = info.replace("${param}", insuranceApply.getCheckInfo());
-            update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
+            if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
+                update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
+            }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
+                update.setStatus(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey());
+            }else if(  Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())){
+                update.setStatus(Constants.InsuranceApplyStatus.UPLOAD.getKey());
+            }else if(  Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS.getKey())){
+                update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+            }
         }else{
             //濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
             if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())
@@ -324,13 +399,7 @@
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
             }
             applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
-            if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
-                update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
-            }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
-                update.setStatus(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey());
-            }else if(  Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())){
-                update.setStatus(Constants.InsuranceApplyStatus.UPLOAD.getKey());
-            }
+            update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
         }
         update.setEditDate(new Date());
         update.setEditor(user.getId());
@@ -346,6 +415,7 @@
 
 
     }
+
     @Override
     public  String getSignLink(Integer id) {
         if(id == null ){
@@ -405,9 +475,10 @@
         update.setEditDate(new Date());
         update.setSignApplyNo(applyNo);
         insuranceApplyMapper.updateById(update);
-
         return  link;
     }
+
+
     public String uploadSignFile(String link){
         try {
             String bucketName = systemDictDataBiz.queryByCode(Constants.OSS,Constants.BUCKETNAME).getCode();
@@ -443,9 +514,18 @@
         //瀛樺偍寰呭姙淇℃伅
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
         //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                .eq(Notices::getObjId,model.getId()));
         Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
         noticesMapper.insert(notices);
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO);
+            noticesMapper.insert(shopNotices);
+        }
+
+
 
         Multifile f = new Multifile();
         f.setIsdeleted(Constants.ZERO);
@@ -465,9 +545,140 @@
 
         startSendEmail(f, model.getCompanyName(),model.getSolutionsName(),model.getSolutionEmail());
         return  f;
-
     }
+
+    /**
+     * 濮旀墭淇� 鏂规纭涔︼紙浼佷笟锛�
+     * @param model
+     * @param fileurl
+     * @param fullUrl
+     * @return
+     */
+    public Multifile   uploadFAQRSSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
+        InsuranceApply update = new InsuranceApply();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�");
+        update.setCheckUserId(model.getCreator());
+        update.setId(model.getId());
+        insuranceApplyMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullUrl);
+        f.setInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�");
+        f.setName("鏂规纭涔�.pdf");
+        multifileMapper.insert(f);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+        return  f;
+    }
+
+    /**
+     * 濮旀墭淇�  浼佷笟绛剧讲鎶曚繚鐢宠涔�
+     * @param model
+     * @param fileurl
+     * @param fullUrl
+     * @return
+     */
+    public Multifile   uploadTBSQSSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
+        InsuranceApply update = new InsuranceApply();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setUnionApplyTbdStatus(Constants.TWO);
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo("濮旀墭淇濅紒涓氬畬鎴愮缃叉姇淇濈敵璇蜂功");
+        update.setCheckUserId(model.getCreator());
+        update.setId(model.getId());
+        insuranceApplyMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullUrl);
+        f.setInfo("濮旀墭淇濅紒涓氬畬鎴愮缃叉姇淇濈敵璇蜂功");
+        f.setName("鎶曚繚鐢宠涔�.pdf");
+        multifileMapper.insert(f);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SIGNATURE;
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+        return  f;
+    }
+
+    /**
+     * 濮旀墭淇� 浼佷笟绛剧讲 浜哄憳鍚嶅崟
+     * @param model
+     * @param fileurl
+     * @param fullUrl
+     * @return
+     */
+    public Multifile   uploadApplyMemberListSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
+        InsuranceApply update = new InsuranceApply();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
+        update.setCheckUserId(model.getCreator());
+        update.setId(model.getId());
+        insuranceApplyMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.MEMBER_LIST_LATTER.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullUrl);
+        f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
+        f.setName("浜哄憳鍚嶅崟.pdf");
+        multifileMapper.insert(f);
+
+
+
+        //鏁版嵁鏃ュ織
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+                ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        //寰呭姙閫氱煡
+        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+            Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+                    solutions.getShopId(), Constants.NoticeType.SEVEN);
+            notices.setParam1(model.getId().toString());
+            noticesMapper.insert(notices);
+        }
+
+
+        return  f;
+    }
+    
+    
     public Multifile  uploadChangeSignedFileDo(ApplyChange model,String fileurl,String fullurl) {
+        Integer companyId = model.getCompanyId();
         ApplyChange update = new ApplyChange();
         update.setEditDate(new Date());
         update.setEditor(model.getCreator());
@@ -484,11 +695,22 @@
             noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
         }
         //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                .eq(Notices::getObjId,model.getId()));
         Notices notices = new Notices(noticeObjectType,Constants.ZERO,model.getId(),model.getSolutionsName(),
-                model.getCompanyId(), Constants.NoticeType.TWO);
+                companyId, Constants.NoticeType.TWO);
         notices.setParam1(model.getApplyId().toString());
         noticesMapper.insert(notices);
+
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+        //鍟嗘埛寰呭姙
+        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+                    model.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.TWO);
+            notices.setParam1(model.getApplyId().toString());
+            noticesMapper.insert(shopNotices);
+        }
 
         Multifile f = new Multifile();
         f.setIsdeleted(Constants.ZERO);
@@ -502,13 +724,134 @@
         f.setInfo("浼佷笟鐢宠琛ㄧ缃叉枃浠�");
         f.setName("绛剧珷鐢宠琛�.pdf");
         multifileMapper.insert(f);
+
         Constants.ApplyLogType applyLogType =Constants.equalsInteger(Constants.ZERO,model.getType())? Constants.ApplyLogType.CA_JIAJIAN_APPLY_SIGN: Constants.ApplyLogType.CA_CHANGUNIT_APPLY_SIGN;
         ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
 
         startSendEmail(f,model.getCompanyName(),model.getSolutionsName(),model.getSolutionEmail());
         return f;
+    }
 
+
+    public Multifile  uploadChangeMemberListSignedFileDo(ApplyChange model,String fileurl,String fullurl) {
+        ApplyChange update = new ApplyChange();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
+        update.setCheckUserId(model.getCreator());
+        update.setId(model.getId());
+        applyChangeMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullurl);
+        f.setInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
+        f.setName("绛剧珷浜哄憳鍚嶅崟.pdf");
+        multifileMapper.insert(f);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_WTB_FINISH_MEMBER_LIST;
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        applyLogMapper.insert(log);
+
+
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+        //寰呭姙閫氱煡
+        if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
+            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+            if(model.getType().equals(Constants.ONE)){
+                noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+            }
+            Notices notices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),
+                    solutions.getShopId(), Constants.NoticeType.SEVEN);
+            notices.setParam1(model.getApplyId().toString());
+            noticesMapper.insert(notices);
+        }
+        return f;
+    }
+
+    /**
+     * 鍟嗘埛鍚堝苟鍗� 鍟嗘埛绛剧讲鎶曚繚鐢宠鍗�
+     * @param model
+     * @param fileurl
+     * @param fullUrl
+     * @return
+     */
+    public Multifile   uploadUnionApplySignedFileDo(UnionApply model,String fileurl,String fullUrl) {
+        UnionApply update = new UnionApply();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setStatus(Constants.UnionApplyStatus.UPLOAD_INSURANCE_POLICY.getKey());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo("鍟嗘埛瀹屾垚绛剧讲");
+        update.setCheckUserId(model.getCreator());
+        update.setId(model.getId());
+        unionApplyJoinMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.HBD_BD_SIGNED_PDF.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullUrl);
+        f.setInfo("鍟嗘埛绛剧讲鎶曚繚鍗�");
+        f.setName("鍟嗘埛绛剧讲鎶曚繚鍗�.pdf");
+        multifileMapper.insert(f);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.IA_HBD_SIGNATURE_TBD;
+        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
+                ,model.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(model));
+        applyLogMapper.insert(log);
+
+        return  f;
+    }
+
+
+    /**
+     * 鍟嗘埛鍚堝苟鍗�(鍔犲噺淇�/鎹㈠巶) 鍟嗘埛绛剧讲鎶曚繚鐢宠鍗�
+     * @param model
+     * @param fileurl
+     * @param fullUrl
+     * @return
+     */
+    public Multifile   uploadUnionChangeSignedFileDo(UnionChange model,String fileurl,String fullUrl) {
+        UnionChange update = new UnionChange();
+        update.setEditDate(new Date());
+        update.setEditor(model.getCreator());
+        update.setStatus(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey());
+        update.setId(model.getId());
+        unionChangeJoinMapper.updateById(update);
+
+        Multifile f = new Multifile();
+        f.setIsdeleted(Constants.ZERO);
+        f.setCreator(model.getCreator());
+        f.setObjId(update.getId());
+        f.setCreateDate(update.getEditDate());
+        f.setObjType(Constants.MultiFile.WTB_CA_TBD_PDF.getKey());
+        f.setType(Constants.TWO);
+        f.setFileurl(fileurl);
+        f.setFileurlFull(fullUrl);
+        f.setInfo("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�");
+        f.setName("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�.pdf");
+        multifileMapper.insert(f);
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
+        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
+                ,model.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(model));
+        applyLogMapper.insert(log);
+
+        return  f;
     }
 
     private void startSendEmail(Multifile f, String companyName, String solutionsName, String solutionEmail) {
@@ -533,18 +876,20 @@
 
     @Override
     public   void dealWaitSignedData(){
+        String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+                systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+        //鐩翠繚淇濆崟 浼佷笟绛剧珷鏁版嵁澶勭悊
         List<InsuranceApply> applyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
                 new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
                 .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                 .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
+                .eq(Solutions::getType,Constants.ZERO)
                 .isNotNull(InsuranceApply::getSignApplyNo));
-        String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
-                systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
         if(applyList !=null && applyList.size()>0 ){
             for(InsuranceApply model : applyList){
                 String status = signService.linkFileStatus(model.getSignApplyNo());
@@ -555,23 +900,115 @@
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
                     //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
+                    continue;
                 }
                 uploadSignedFileDo(model,fileUrl,path+fileUrl);
-                return;
+//                return;
             }
         }
+        //濮旀墭淇� 浼佷笟绛剧讲鎶曚繚纭涔�
+        applyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+                        .eq(Solutions::getType,Constants.ONE)
+                        .isNotNull(InsuranceApply::getSignQrsNo));
+        if(applyList !=null && applyList.size()>0 ){
+            for(InsuranceApply model : applyList){
+                String status = signService.linkFileStatus(model.getSignQrsNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getSignQrsNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadFAQRSSignedFileDo(model,fileUrl,path+fileUrl);
+//                return;
+            }
+        }
+
+        //濮旀墭淇� 浼佷笟绛剧讲浜哄憳鍚嶅崟
+        applyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+                        .eq(Solutions::getType,Constants.ONE)
+                        .isNotNull(InsuranceApply::getSignMemberListNo));
+        if(applyList !=null && applyList.size()>0 ){
+            for(InsuranceApply model : applyList){
+                String status = signService.linkFileStatus(model.getSignMemberListNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getSignMemberListNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadApplyMemberListSignedFileDo(model,fileUrl,path+fileUrl);
+//                return;
+            }
+        }
+        
+        //濮旀墭淇濅紒涓氱缃叉姇淇濈敵璇峰崟
+        applyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
+                new MPJLambdaWrapper<InsuranceApply>()
+                        .selectAll(InsuranceApply.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(InsuranceApply::getUnionApplyTbdStatus,Constants.ONE)
+                        .eq(Solutions::getType,Constants.ONE)
+                        .isNotNull(InsuranceApply::getApplyTbdNo));
+
+        if(applyList !=null && applyList.size()>0 ){
+            for(InsuranceApply model : applyList){
+                String status = signService.linkFileStatus(model.getApplyTbdNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getApplyTbdNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadTBSQSSignedFileDo(model,fileUrl,path+fileUrl);
+//                return;
+            }
+        }
+        
+        
+
         List<ApplyChange> chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
                 new MPJLambdaWrapper<ApplyChange>()
                 .selectAll(ApplyChange.class)
                 .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                 .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
                 .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.UPLOAD.getKey())
+                .eq(Solutions::getType,Constants.ZERO)
                 .isNotNull(ApplyChange::getSignApplyNo));
         if(chagneList !=null && chagneList.size()>0 ){
             for(ApplyChange model : chagneList){
@@ -583,12 +1020,97 @@
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
                     //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
+                    continue;
                 }
                 uploadChangeSignedFileDo(model,fileUrl,path+fileUrl);
-                return;
+//                return;
             }
         }
+
+        //濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 绛剧讲浜哄憳鍚嶅崟
+        chagneList = applyChangeMapper.selectJoinList(ApplyChange.class,
+                new MPJLambdaWrapper<ApplyChange>()
+                        .selectAll(ApplyChange.class)
+                        .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                        .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                        .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+                        .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                        .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
+                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.UPLOAD.getKey())
+                        .eq(Solutions::getType,Constants.ONE)
+                        .isNotNull(ApplyChange::getSignMemberListNo));
+        if(chagneList !=null && chagneList.size()>0 ){
+            for(ApplyChange model : chagneList){
+                String status = signService.linkFileStatus(model.getSignMemberListNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getSignMemberListNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadChangeMemberListSignedFileDo(model,fileUrl,path+fileUrl);
+//                return;
+            }
+        }
+
+
+
+        /**
+         *鍚堝苟鎶曚繚鍗� 绛剧讲涓氬姟
+         */
+        List<UnionApply> unionApplyList = unionApplyJoinMapper.selectJoinList(UnionApply.class,
+                new MPJLambdaWrapper<UnionApply>()
+                        .selectAll(UnionApply.class)
+                        .eq(UnionApply::getStatus,Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())
+                        .isNotNull(UnionApply::getSignApplyNo));
+        if(unionApplyList !=null && unionApplyList.size()>0 ){
+            for(UnionApply model : unionApplyList){
+                String status = signService.linkFileStatus(model.getSignApplyNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getSignApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadUnionApplySignedFileDo(model,fileUrl,path+fileUrl);
+            }
+        }
+
+        /**
+         *鍚堝苟鍔犲噺淇濇崲鍘� 绛剧讲涓氬姟
+         */
+        List<UnionChange> unionChangeList = unionChangeJoinMapper.selectJoinList(UnionChange.class,
+                new MPJLambdaWrapper<UnionChange>()
+                        .selectAll(UnionChange.class)
+                        .eq(UnionChange::getStatus,Constants.UnionChangeStatus.MERGE.getKey())
+                        .isNotNull(UnionChange::getSignApplyNo));
+        if(unionChangeList !=null && unionChangeList.size()>0 ){
+            for(UnionChange model : unionChangeList){
+                String status = signService.linkFileStatus(model.getSignApplyNo());
+                if(!StringUtils.equals(status,"3")){
+                    continue;
+                }
+                String link = signService.linkFile(model.getSignApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    continue;
+                }
+                uploadUnionChangeSignedFileDo(model,fileUrl,path+fileUrl);
+            }
+        }
+
+
+
     }
     @Override
     public   void dealSignResult(NotifyDataReq data){
@@ -599,6 +1121,7 @@
             //濡傛灉宸蹭繚鍏�,鍙笅杞界绾﹂檮浠�
             String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                     systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+            //鐩翠繚 鎶曚繚鐢宠
             InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
                     new MPJLambdaWrapper<InsuranceApply>()
                             .selectAll(InsuranceApply.class)
@@ -607,6 +1130,7 @@
                             .selectAs(Company::getName,InsuranceApply::getCompanyName)
                             .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                             .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ZERO)
                             .eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
                             .last("limit 1" ));
             if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
@@ -620,16 +1144,94 @@
                 uploadSignedFileDo(model,fileUrl,path+fileUrl);
                 return;
             }
+            //濮旀墭淇� 浼佷笟鏂规纭涔�
+            InsuranceApply modelTBQRS = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                    new MPJLambdaWrapper<InsuranceApply>()
+                            .selectAll(InsuranceApply.class)
+                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ONE)
+                            .eq(InsuranceApply::getSignQrsNo,data.getApplyNo())
+                            .last("limit 1" ));
+            if(modelTBQRS != null && Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
+                return;
+            }
+
+
+
+            //濮旀墭淇� 浼佷笟绛剧讲浜哄憳鍚嶅崟
+            InsuranceApply modelMemberList = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                    new MPJLambdaWrapper<InsuranceApply>()
+                            .selectAll(InsuranceApply.class)
+                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ONE)
+                            .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo())
+                            .last("limit 1" ));
+            if(modelMemberList != null && Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
+                return;
+            }
+
+
+            //濮旀墭淇� 鎶曚繚鐢宠涔︾缃�
+            InsuranceApply modelTBQSQ = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,
+                    new MPJLambdaWrapper<InsuranceApply>()
+                            .selectAll(InsuranceApply.class)
+                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ONE)
+                            .eq(InsuranceApply::getApplyTbdNo,data.getApplyNo())
+                            .last("limit 1" ));
+            if(modelTBQRS != null && Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
+                return;
+            }
+
+            //鐩翠繚 鍔犲噺淇濅紒涓氱缃�
             ApplyChange applyChange = applyChangeMapper.selectJoinOne(ApplyChange.class,
                     new MPJLambdaWrapper<ApplyChange>()
                             .selectAll(ApplyChange.class)
                             .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                             .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
                             .selectAs(Company::getName,InsuranceApply::getCompanyName)
                             .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                             .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                             .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                             .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ZERO)
                             .eq(ApplyChange::getSignApplyNo,data.getApplyNo()).last("limit 1" ));
             if(applyChange != null &&Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
                 String link = signService.linkFile(data.getApplyNo());
@@ -640,18 +1242,92 @@
                 }
                 uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
             }
+
+            //濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
+            ApplyChange applyChangeMemberList = applyChangeMapper.selectJoinOne(ApplyChange.class,
+                    new MPJLambdaWrapper<ApplyChange>()
+                            .selectAll(ApplyChange.class)
+                            .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                            .selectAs(Solutions::getEmail,InsuranceApply::getSolutionEmail)
+                            .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+                            .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                            .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
+                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                            .eq(Solutions::getType,Constants.ONE)
+                            .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()).last("limit 1" ));
+            if(applyChangeMemberList != null &&Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
+            }
+
+
+            //鎶曚繚鍚堝苟鍗� 鍟嗘埛绛剧讲淇濆崟
+            UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
+                    .lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
+            if(unionApply != null &&Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
+            }
+
+
+            /**
+             *鍚堝苟鍔犲噺淇濇崲鍘� 绛剧讲涓氬姟
+             */
+            UnionChange unionChange = unionChangeJoinMapper.selectOne(
+                    new MPJLambdaWrapper<UnionChange>()
+                            .selectAll(UnionChange.class)
+                            .eq(UnionChange::getSignApplyNo,data.getApplyNo())
+                            .last(" limit 1 "));
+            if(unionChange != null &&Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
+                String link = signService.linkFile(model.getSignApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return;
+                }
+                uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+            }
+
+
         }else if(Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
             //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
             insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
                     .set(InsuranceApply::getSignApplyNo,null)
                     .eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
-            //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆$绔犻噸鏂扮敓鎴愭柊鍚堝悓
             applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
                     .set(ApplyChange::getSignApplyNo,null)
                     .eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
+            insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                    .set(InsuranceApply::getSignQrsNo,null)
+                    .eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
+            insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                    .set(InsuranceApply::getSignMemberListNo,null)
+                    .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
+            unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
+                    .set(UnionApply::getSignApplyNo,null)
+                    .eq(UnionApply::getSignApplyNo,data.getApplyNo()));
+            applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
+                    .set(ApplyChange::getSignMemberListNo,null)
+                    .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
+            unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
+                    .set(UnionChange::getSignApplyNo,null)
+                    .eq(UnionChange::getSignApplyNo,data.getApplyNo()));
         }
-
     }
+
+
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer uploadToubaodan(InsuranceApply insuranceApply) {
@@ -666,9 +1342,16 @@
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
         }
         if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())
+                || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
                 || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
             throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
         }
+
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         InsuranceApply update = new InsuranceApply();
         update.setEditDate(new Date());
@@ -680,6 +1363,14 @@
         update.setId(model.getId());
         insuranceApplyMapper.updateById(update);
 
+        multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
+                .eq(Multifile::getObjId,update.getId())
+                .set(Multifile::getIsdeleted,Constants.ONE)
+                .set(Multifile::getEditDate,update.getEditDate())
+                .set(Multifile::getEditor,update.getEditor())
+        );
         insuranceApply.getToubaodanFile().setIsdeleted(Constants.ZERO);
         insuranceApply.getToubaodanFile().setCreator(user.getId());
         insuranceApply.getToubaodanFile().setObjId(update.getId());
@@ -699,6 +1390,10 @@
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
         noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
 
+        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+                model.getCompanyId(), Constants.NoticeType.ONE);
+        noticesMapper.insert(notices);
+
         return  1;
 
     }
@@ -711,7 +1406,8 @@
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer check(InsuranceApply insuranceApply) {
-        if(insuranceApply.getId() == null || StringUtils.isBlank(insuranceApply.getCheckInfo())){
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(insuranceApply.getId() == null){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
@@ -719,46 +1415,72 @@
         if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
         }
-        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
-            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
-        }
-
         Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
         if(Objects.isNull(solutions)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
         }
+        if(Constants.equalsObject(solutions.getType(),Constants.ZERO)){
+            if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+        }else{
+            if(!Constants.equalsObject(user.getType(),Constants.TWO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
+            }
+            //濮旀墭淇濆緟绛剧讲銆佸緟瀹℃牳鍙繘琛岄��鍥炴搷浣�
+            if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+                    ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+                    ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
+                    )){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+        }
 
         Constants.ApplyLogType applyLogType = null;
-        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         InsuranceApply update = new InsuranceApply();
         update.setEditDate(new Date());
         update.setEditor(user.getId());
         update.setCheckDate(update.getEditDate());
         update.setCheckInfo(insuranceApply.getCheckInfo());
         update.setCheckUserId(user.getId());
-        update.setId(model.getId());
-        Constants.NoticeType noticeType = Constants.NoticeType.ONE;
+        update.setId(model.getId()); 
         if(insuranceApply.getDealBackApply() ==1){
             //濡傛灉鏄笉閫氳繃
             applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ;
             update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
-
-            noticeType = Constants.NoticeType.FOUR;
+            if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+                update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
+            }
         }else{
             applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
-            update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+            if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+                update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
+            }
         }
         insuranceApplyMapper.updateById(update);
 
         //瀛樺偍寰呭姙淇℃伅
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
-        //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
-        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),model.getCompanyId(),noticeType);
-        noticesMapper.insert(notices);
+        if(Constants.equalsObject(solutions.getType(),Constants.ZERO)) {
+            //鍒犻櫎鍏朵粬寰呭姙
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+                    .eq(Notices::getObjType, noticeObjectType.getKey())
+                    .ne(Notices::getType, Constants.NoticeType.SIX.getStatus())
+                    .eq(Notices::getObjId, model.getId()));
+        }else{
+            //鍒犻櫎鍏ㄩ儴寰呭姙
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda()
+                    .eq(Notices::getObjType, noticeObjectType.getKey())
+                    .eq(Notices::getObjId, model.getId()));
+        }
+
 
         String info =applyLogType.getInfo();
-        info = info.replace("${param}", update.getCheckInfo());
+        if(StringUtils.isNotBlank(update.getCheckInfo())){
+            info = info.replace("${param}", update.getCheckInfo());
+        }else{
+            info = null;
+        }
         ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
         return  1;
@@ -796,8 +1518,13 @@
             throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鍛樺伐淇℃伅瀛樺湪閲嶅淇℃伅");
         }
         Constants.InsuranceApplyStatus insuranceApplyStatus = Constants.InsuranceApplyStatus.UPLOAD;
+        if(solutions.getType().equals(Constants.ONE)){
+            insuranceApplyStatus = Constants.InsuranceApplyStatus.WTB_UPLOAD;
+        }
         insuranceApply.setCreateDate(new Date());
         insuranceApply.setCreator(loginUserInfo.getId());
+        insuranceApply.setEditor(loginUserInfo.getId());
+        insuranceApply.setEditDate(new Date());
         insuranceApply.setIsdeleted(Constants.ZERO);
         insuranceApply.setCompanyId(loginUserInfo.getCompanyId());
         insuranceApply.setCheckInfo(insuranceApplyStatus.getName());
@@ -806,6 +1533,7 @@
         insuranceApply.setCurrentFee(BigDecimal.ZERO);
         insuranceApply.setCheckUserId(loginUserInfo.getId());
         insuranceApply.setStatus(insuranceApplyStatus.getKey());
+        insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
 
         CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
         countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId());
@@ -828,17 +1556,25 @@
 //        info = info.replace("${param}", update.getCheckInfo());
         ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),null, null);
         applyLogMapper.insert(log);
-
-
-
-        //鍙戦�佸緟鍔炰笟鍔�
-
-        //瀛樺偍寰呭姙淇℃伅
-        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
-        //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
-        Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
-        noticesMapper.insert(notices);
+        
+        //鐩翠繚涓氬姟鍙戦�佸緟鍔�
+        if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+            //瀛樺偍寰呭姙淇℃伅
+            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+            //鍒犻櫎鍏朵粬寰呭姙
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                    .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                    .eq(Notices::getObjId,insuranceApply.getId()));
+            //瀛樺偍骞冲彴寰呭姙
+            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
+            noticesMapper.insert(notices);
+            //鍟嗘埛寰呭姙
+            if(Objects.nonNull(solutions.getShopId())){
+                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
+                noticesMapper.insert(shopNotices);
+            }
+        }
 
         return insuranceApply.getId();
     }
@@ -920,7 +1656,9 @@
         //瀛樺偍寰呭姙淇℃伅
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
         //鍒犻櫎鍏朵粬寰呭姙
-        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                .eq(Notices::getObjId,insuranceApply.getId()));
         Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
         noticesMapper.insert(notices);
 
@@ -1027,6 +1765,15 @@
                 applyDetail.setIdcardNo(member.getIdcardNo());
                 applyDetail.setSex(member.getSex());
                 applyDetail.setFee(countCyclePriceVO.getCyclePrice());
+                applyDetail.setCurrentFee(BigDecimal.ZERO);
+                //鑾峰彇璁$畻鎬诲ぉ鏁�
+                Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+                if(Constants.equalsInteger(maxDays,0)||Objects.isNull(applyDetail.getFee())){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
+                }
+                applyDetail.setPrice(
+                        applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
+                );
                 //楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
                 if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
                     throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
@@ -1091,27 +1838,57 @@
         QueryWrapper<InsuranceApply> wrapper = new QueryWrapper<>(insuranceApply);
         return insuranceApplyMapper.selectList(wrapper);
     }
+
+    public List<Integer> getCollectStatus(Integer collectStatus){
+        if(collectStatus ==null){
+            return  new ArrayList<>();
+        }
+        List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
+        if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
+        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
+        }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
+        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
+        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
+        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
+        }
+
+        return statusList;
+    }
   
     @Override
     public PageData<InsuranceApply> findPage(PageWrap<InsuranceApplyQueryDTO> pageWrap) {
         IPage<InsuranceApply> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
-        List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(pageWrap.getModel().getStatusCollect());
+
+        List<Integer> statusList = this.getCollectStatus(pageWrap.getModel().getStatusCollect());
+
         queryWrapper.selectAll(InsuranceApply.class);
         queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
         queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
+        queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
+        queryWrapper.selectAs(Solutions::getMaxAge,InsuranceApply::getMaxAge);
+        queryWrapper.selectAs(Solutions::getMinAge,InsuranceApply::getMinAge);
+        queryWrapper.selectAs(Solutions::getPrice,InsuranceApply::getPrice);
+        queryWrapper.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit);
         queryWrapper.select(" DATEDIFF( t.END_TIME ,now()  ) AS loseEfficacyDays  ");
-        queryWrapper.select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
+        queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
         if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){
-            queryWrapper.select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
-            queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
+            queryWrapper.select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status  = 1 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
+            queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status = 1 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
         }
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
         queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
         queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
         queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
         queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
         if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
             queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
             queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
@@ -1121,6 +1898,16 @@
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else if(loginUserInfo.getType().equals(Constants.TWO)){
+            //濡傛灉鏄晢鎴锋煡鐪�
+            if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==0){
+                queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+            }else if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==1){
+                queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
+            }else{
+                queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+                        "t1.type=1 and t1.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+            }
         }else{
             if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
                 queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
@@ -1132,23 +1919,26 @@
         if (pageWrap.getModel().getSolutionId() != null) {
             queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
         }
+        if (pageWrap.getModel().getSolutionType() != null) {
+            queryWrapper.eq(Solutions::getType, pageWrap.getModel().getSolutionType());
+        }
         if (pageWrap.getModel().getEndTimeS() != null) {
             queryWrapper.ge(InsuranceApply::getEndTime, Utils.Date.getStart(pageWrap.getModel().getEndTimeS()));
         }
         if (pageWrap.getModel().getEndTimeE() != null) {
-            queryWrapper.le(InsuranceApply::getEndTime, Utils.Date.getEnd(pageWrap.getModel().getEndTimeE()));
+            queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getEnd(pageWrap.getModel().getEndTimeE()));
         }
         if (pageWrap.getModel().getStartTimeS() != null) {
             queryWrapper.ge(InsuranceApply::getStartTime, Utils.Date.getStart(pageWrap.getModel().getStartTimeS()));
         }
         if (pageWrap.getModel().getStartTimeE() != null) {
-            queryWrapper.le(InsuranceApply::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTimeE()));
+            queryWrapper.lt(InsuranceApply::getStartTime, Utils.Date.getEnd(pageWrap.getModel().getStartTimeE()));
         }
         if (pageWrap.getModel().getCreateTimeS() != null) {
             queryWrapper.ge(InsuranceApply::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateTimeS()));
         }
         if (pageWrap.getModel().getCreateTimeE() != null) {
-            queryWrapper.le(InsuranceApply::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeE()));
+            queryWrapper.lt(InsuranceApply::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeE()));
         }
         if (pageWrap.getModel().getType() != null) {
             queryWrapper.eq(Solutions::getType, pageWrap.getModel().getType());
@@ -1157,7 +1947,10 @@
             queryWrapper.eq(InsuranceApply::getCode, pageWrap.getModel().getCode());
         }
         if (pageWrap.getModel().getStatus() != null) {
-            queryWrapper.eq(InsuranceApply::getStatus, pageWrap.getModel().getStatus());
+            queryWrapper.in(InsuranceApply::getStatus, pageWrap.getModel().getStatus().split(","));
+        }
+        if (pageWrap.getModel().getLoseEfficacy() != null && pageWrap.getModel().getLoseEfficacy() ==1) {
+            queryWrapper.apply("  DATEDIFF(t.END_TIME,CURRENT_DATE() ) <= 5  and t.END_TIME >= now() ");
         }
         if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
             for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -1182,7 +1975,7 @@
 
     public void    initApplyStatus(InsuranceApply apply){
         apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
-        if(Constants.equalsInteger(apply.getStatusCollect(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+        if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
             //濡傛灉宸插畬鎴�
             if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
                 apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
@@ -1200,14 +1993,21 @@
         queryWrapper.selectAll(InsuranceApply.class);
         queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
         queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
-        queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney ");
-        queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
+        queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
+        queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum");
+        queryWrapper.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac  where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate");
+        queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney ");
+        queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on td.TAX_ID = ts.id  where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
         queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
         queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
+        queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else if(loginUserInfo.getType().equals(Constants.TWO)){
+            //濡傛灉鏄晢瀹舵煡鐪�
+            queryWrapper.eq(Solutions::getShopId, loginUserInfo.getCompanyId());
         }else{
             if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
                 queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
@@ -1217,6 +2017,9 @@
         }
         if (model.getSolutionId() != null) {
             queryWrapper.eq(InsuranceApply::getSolutionId, model.getSolutionId());
+        }
+        if (model.getSolutionType() != null) {
+            queryWrapper.eq(Solutions::getType,model.getSolutionType() );
         }
         if (model.getEndTimeS() != null) {
             queryWrapper.ge(InsuranceApply::getEndTime, Utils.Date.getStart(model.getEndTimeS()));
@@ -1243,13 +2046,74 @@
             queryWrapper.eq(InsuranceApply::getCode, model.getCode());
         }
         if (model.getStatus() != null) {
-            queryWrapper.eq(InsuranceApply::getStatus, model.getStatus());
+            queryWrapper.in(InsuranceApply::getStatus, model.getStatus().split(","));
         }
         if (CollectionUtils.isNotEmpty(model.getIds())) {
             queryWrapper.in(InsuranceApply::getId, model.getIds());
         }
+        if (CollectionUtils.isNotEmpty(model.getIds())) {
+            queryWrapper.in(InsuranceApply::getId, model.getIds());
+        }
+        if (model.getIsEffective() != null && model.getIsEffective().equals(Constants.ZERO)) {
+            queryWrapper.ge(InsuranceApply::getEndTime,DateUtil.DateToStr(new Date(),"yyyy-MM-dd HH:mm:ss"));
+        }
         List<InsuranceApply> list = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class, queryWrapper);
+        if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
+            //濡傛灉鏄悎骞跺崟,闇�瑕佹煡璇㈤檮浠朵俊鎭�
+            initFileForList(list);
+        }
         return list;
+    }
+
+    private void initFileForList(List<InsuranceApply> list) {
+        List<Integer> objList =  new ArrayList<>();
+        if(list!=null && list.size()>0){
+            for(InsuranceApply param : list){
+                objList.add(param.getId());
+            }
+        }else{
+            return;
+        }
+        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                .in(Multifile::getObjId,objList)
+                .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
+                        ,Constants.MultiFile.BD_SIGNED_PDF.getKey()
+                        ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
+                        ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
+                        ,Constants.MultiFile.BD_DONE_PDF.getKey()}))
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .orderByAsc(Multifile::getId));
+        if(multifiles!=null && multifiles.size()>0){
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+                    +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+            for(InsuranceApply model : list){
+                for(Multifile f : multifiles) {
+                    if (StringUtils.isBlank(f.getFileurl())) {
+                        continue;
+                    }
+                    f.setFileurlFull(path+f.getFileurl());
+                    if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
+                        if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_APPLY_PDF.getKey())) {
+                            //绛剧讲鍓嶇殑鎶曚繚鍗�
+                            model.setToubaodanFile(f);
+                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_SIGNED_PDF.getKey())) {
+                            //绛剧讲鍚庣殑鎶曚繚鍗�
+                            model.setToubaodanSignedFile(f);
+                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.BD_DONE_PDF.getKey())) {
+                            //鏈�绲備繚闄╁崟
+                            model.setBaoxiandanFile(f);
+                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.MEMBER_LIST_LATTER.getKey())) {
+                            //鐢宠鍗�
+                            model.setShenqingdanFile(f);
+                        } else if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())) {
+                            //绛剧讲鍚庣‘璁や功
+                            model.setFanganFile(f);
+                        }
+                    }
+                }
+            }
+        }
+
     }
 
 
@@ -1266,11 +2130,19 @@
 
         MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
+                 .selectAs(Solutions::getMaxAge,InsuranceApply::getMaxAge)
+                 .selectAs(Solutions::getMinAge,InsuranceApply::getMinAge)
+                .selectAs(Solutions::getPrice,InsuranceApply::getPrice)
+                .selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit)
+                .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
                 .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
-                .select(" ( select count(1) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+                .select(" ( select max(ac.APPLY_START_TIME) from apply_change ac  where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate")
+                .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+                .select(" t3.name as shopName")
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                .leftJoin(Company.class,Company::getId,Solutions::getShopId)
                 .eq(InsuranceApply::getId,id)
                 .last("limit 1");
 
@@ -1279,6 +2151,19 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
 
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+        }
+        if(solutions.getDataType().equals(Constants.ONE)){
+            Solutions newVersionSolution = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+            if(Objects.isNull(newVersionSolution)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
+            }
+            insuranceApply.setNewVersionSolutionId(newVersionSolution.getId());
+        }else{
+            insuranceApply.setNewVersionSolutionId(solutions.getId());
+        }
         if(insuranceApply.getStartTime().compareTo(new Date())<0  && insuranceApply.getEndTime().compareTo(new Date()) > 0 ){
             insuranceApply.setLoseEfficacyDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),new Date()));
         }
@@ -1291,6 +2176,7 @@
                         .selectAll(ApplyLog.class)
                         .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
                         .selectAs(Company::getName,ApplyLog::getCompanyName)
+                        .selectAs(SystemUser::getType,ApplyLog::getCreatorType)
                         .leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
                         .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                         .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.ZERO))
@@ -1321,11 +2207,14 @@
 
     private void initImgData(InsuranceApply model) {
         List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
-                .eq(Multifile::getObjId,model.getId())
+                .eq(Multifile::getObjId, model.getId())
                 .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
                         ,Constants.MultiFile.BD_SIGNED_PDF.getKey()
+                        ,Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey()
+                        ,Constants.MultiFile.MEMBER_LIST_LATTER.getKey()
                         ,Constants.MultiFile.BD_DONE_PDF.getKey()}))
-                .eq(Multifile::getIsdeleted,Constants.ZERO));
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .orderByAsc(Multifile::getId));
         if(multifiles!=null){
             String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
                     +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
@@ -1343,6 +2232,12 @@
                 }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.BD_DONE_PDF.getKey())){
                     //鏈�绲備繚闄╁崟
                     model.setBaoxiandanFile(f);
+                }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.MEMBER_LIST_LATTER.getKey())){
+                    //鐢宠鍗�
+                    model.setShenqingdanFile(f);
+                }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_CONFIRMATION_LATTER.getKey())){
+                    //绛剧讲鍚庣‘璁や功
+                    model.setFanganFile(f);
                 }
 
 //                if(model.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
@@ -1397,8 +2292,7 @@
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO){
         if(Objects.isNull(insuranceApplyOptDTO)
-            ||Objects.isNull(insuranceApplyOptDTO.getApplyId())
-            ||StringUtils.isBlank(insuranceApplyOptDTO.getOptIllustration())){
+            ||Objects.isNull(insuranceApplyOptDTO.getApplyId())){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -1423,6 +2317,7 @@
         if(insuranceApplyOptDTO.getOptType().equals(Constants.ONE)){
             if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
                     ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
                     ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
             }
@@ -1432,16 +2327,24 @@
                 insuranceApplyStatus =  Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE;
             }else  if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())){
                 insuranceApplyStatus =  Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE;
+            }else  if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())){
+                insuranceApplyStatus =  Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
             }
 
             //瀛樺偍寰呭姙淇℃伅
             //鍒犻櫎鍏朵粬寰呭姙
-            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
-            Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+                            .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                    .eq(Notices::getObjId,insuranceApply.getId()));
+            Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
                     insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
             noticesMapper.insert(notices);
-
-
+            //鍟嗘埛寰呭姙
+            if(Objects.nonNull(solutions.getShopId())){
+                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
+                noticesMapper.insert(shopNotices);
+            }
         }else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
             insuranceApplyStatus =  Constants.InsuranceApplyStatus.CLOSE;
             if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){
@@ -1449,8 +2352,9 @@
             }
             if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
                     ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey())
                     ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!");
             }
             //鍒犻櫎鍏朵粬寰呭姙
             noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
@@ -1463,21 +2367,48 @@
         //瀛樺偍鏃ュ織鏁版嵁
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.COMPANY_APPLY_RETURN;
         String info =applyLogType.getInfo();
-        info = info.replace("${param}", insuranceApplyOptDTO.getOptIllustration());
+        if(StringUtils.isNotBlank(insuranceApplyOptDTO.getOptIllustration())){
+            info = info.replace("${param}", insuranceApplyOptDTO.getOptIllustration());
+        }
         ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),JSONObject.toJSONString(insuranceApply), JSONObject.toJSONString(insuranceApply));
         applyLogMapper.insert(log);
     }
 
 
     /**
+     * 浼佷笟淇濋殰涓汉鏁�
+     * @return
+     */
+    @Override
+    public Integer guaranteeNum() {
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(loginUserInfo.getType().equals(Constants.ZERO)){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+        }
+        MPJLambdaWrapper<ApplyDetail> lambdaWrapper = new MPJLambdaWrapper<ApplyDetail>();
+        lambdaWrapper.select(ApplyDetail::getId)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+                .and(i->i.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()).or().eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()))
+                .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
+                .apply(" now() between t.START_TIME and t.END_TIME ");
+
+         Integer count = applyDetailJoinMapper.selectJoinCount(lambdaWrapper);
+        return count;
+    }
+
+
+
+
+    /**
      * 鏇存柊淇濆崟瀹為檯閲戦
      */
     @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public void updateApplyCurrentFee(Integer id){
-        List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
+        List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
+                .selectAll(InsuranceApply.class)
                 .eq(InsuranceApply::getIsdeleted,Constants.ZERO)
-                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+                .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
                 .eq(!Objects.isNull(id),InsuranceApply::getId,id)
                 .le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
                 .ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
@@ -1485,20 +2416,26 @@
 
         if(CollectionUtils.isNotEmpty(insuranceApplyList)){
             for (InsuranceApply insuranceApply:insuranceApplyList) {
-                Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
-                if(Objects.isNull(solutions)){
-                    continue;
-                }
+//                Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+//                if(Objects.isNull(solutions)){
+//                    continue;
+//                }
                 BigDecimal sumAmount = BigDecimal.ZERO;
-                List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+                List<ApplyDetail> applyDetailList = applyDetailMapper
+                        .selectList(new QueryWrapper<ApplyDetail>().lambda()
+                                .eq(ApplyDetail::getApplyId,insuranceApply.getId()));
                 if(CollectionUtils.isNotEmpty(applyDetailList)){
                     for (ApplyDetail applyDetail: applyDetailList) {
                         //2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁$畻 褰撳墠璐圭敤  鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
-                        Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+//                        Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
                         BigDecimal fee = applyDetail.getFee();
                         if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
                             Integer days =  DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
-                            applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+                            applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
+                            //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+                            applyDetailMapper.updateById(applyDetail);
+                        }else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
+                            applyDetail.setCurrentFee(fee);
                             applyDetailMapper.updateById(applyDetail);
                         }
                         sumAmount = sumAmount.add(applyDetail.getCurrentFee());
@@ -1508,7 +2445,6 @@
                 insuranceApplyMapper.updateById(insuranceApply);
             }
         }
-
     }
 
 
@@ -1531,7 +2467,264 @@
     }
 
 
+    /**
+     * 鐢熸垚 寰呭鎵归�氱煡
+     */
+    @Override
+    public void generateNotice(){
+        List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
+                .selectAll(InsuranceApply.class)
+                .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+                .ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd HH:mm:ss"))
+                        .apply("  DATEDIFF(t.END_TIME,CURRENT_DATE() ) <= 5 ")
+                .notExists(" select  1 from notices n where n.obj_type = 0 and n.type = 6 and n.obj_id = t.id   ")
+        );
+        for (InsuranceApply insuranceApply:insuranceApplyList) {
+            Notices notices = new Notices(Constants.NoticeObjectType.INSURANCE_APPLY,Constants.ONE,insuranceApply.getId(),insuranceApply.getSolutionsName(),
+                    insuranceApply.getCompanyId(), Constants.NoticeType.SIX);
+            noticesMapper.insert(notices);
+        }
+    }
 
 
+    /**
+     * 濮旀墭瀹� 鎶曚繚纭涔�
+     * @param smsCheckDTO
+     * @return
+     */
+    @Override
+    public  String getSignTBQRSLink(SmsCheckDTO smsCheckDTO) {
+        if(Objects.isNull(smsCheckDTO)
+            || Objects.isNull(smsCheckDTO.getBusinessId())
+                || StringUtils.isBlank(smsCheckDTO.getCode())
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        if(!debugModel){
+            smsEmailService.validateCode(smsCheckDTO.getCode());
+        }
+        MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
+                .selectAll(InsuranceApply.class)
+                .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(InsuranceApply::getId,smsCheckDTO.getBusinessId())
+                .last("limit 1");
+        InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper);
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        if(Constants.equalsInteger(solutions.getType(),(Constants.ZERO))){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝闈炲鎵樹繚鏂规淇濆崟!");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Constants.ApplyLogType applyLogType = null;
+        String info = "";
+        //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
+        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+        Company company = user.getCompany();
+        if(debugModel){
+            company = companyMapper.selectById(model.getCompanyId());
+        }
+        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+        Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+                .eq(Multifile::getObjId,solutions.getId())
+                .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
+                .eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
+        if(f == null || StringUtils.isBlank(f.getFileurl())){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇纭涔︽枃浠跺け璐ワ紝璇疯仈绯诲晢鎴风‘璁ゆ姇淇濈‘璁や功鏄惁姝g‘锛�");
+        }
+        String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl();
+        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+        String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl);
+        if(StringUtils.isBlank(applyNo) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        String link = signService.signLink(applyNo,company.getName(),company.getCode());
+        if(StringUtils.isBlank(link) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        InsuranceApply update= new InsuranceApply();
+        update.setId(model.getId());
+        update.setEditor(user.getId());
+        update.setEditDate(new Date());
+        update.setSignQrsNo(applyNo);
+        insuranceApplyMapper.updateById(update);
+        return  link;
+    }
+
+
+
+    @Override
+    public  InsuranceApply  queryApplyDetail(Integer applyId){
+        InsuranceApply model = findDetail(applyId);
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        //鏌ヨ淇濆崟鏄庣粏淇℃伅
+        List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
+                .selectAll(ApplyDetail.class)
+                .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
+                .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
+                .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+                .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+                .isNull(ApplyDetail::getFromId)
+                .eq(ApplyDetail::getApplyId,model.getId())
+        );
+        model.setApplyDetailList(applyDetailList);
+        return model;
+    }
+
+
+
+    /**
+     * 浜哄憳鍚嶅崟绛剧珷
+     */
+    @Override
+    public String getMemberListOnlineSignLink(SmsCheckDTO smsCheckDTO) {
+        if(Objects.isNull(smsCheckDTO)
+                || Objects.isNull(smsCheckDTO.getBusinessId())
+                || StringUtils.isBlank(smsCheckDTO.getCode())
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        //楠岃瘉 楠岃瘉鐮�
+        if(!debugModel){
+            smsEmailService.validateCode(smsCheckDTO.getCode());
+        }
+        InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId());
+        if(Objects.isNull(model)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
+        }
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey(),model.getStatus())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Company company = user.getCompany();
+        if(debugModel){
+            company = companyMapper.selectById(model.getCompanyId());
+        }
+        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        if(solutions.getType().equals(Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝闈炲鎵樹繚鏂规淇濆崟锛屾棤娉曡繘琛岃鎿嶄綔!");
+        }
+        String fileUrl =  ExcelExporter.build(InsuranceApply.class).exportApplyExcelToPdf(model,"浜哄憳鍚嶅崟");
+        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+        String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚鍚嶅崟绛剧珷",company.getSignId(),notifyUrl);
+        if(StringUtils.isBlank(applyNo) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        String link = signService.signLink(applyNo,company.getName(),company.getCode());
+        if(StringUtils.isBlank(link) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        InsuranceApply update= new InsuranceApply();
+        update.setId(model.getId());
+        update.setEditor(user.getId());
+        update.setEditDate(new Date());
+        update.setSignMemberListNo(applyNo);
+        insuranceApplyMapper.updateById(update);
+        return  link;
+    }
+
+
+    /**
+     * 濮旀墭淇� 鎶曚繚鐢宠绛剧讲
+     * @param smsCheckDTO
+     * @return
+     */
+    @Override
+    public  String getSignWTBTBDLink(SmsCheckDTO smsCheckDTO) {
+        if(Objects.isNull(smsCheckDTO)
+                || Objects.isNull(smsCheckDTO.getBusinessId())
+                || StringUtils.isBlank(smsCheckDTO.getCode())
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        //楠岃瘉 楠岃瘉鐮�
+        if(!debugModel){
+            smsEmailService.validateCode(smsCheckDTO.getCode());
+        }
+        MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
+                .selectAll(InsuranceApply.class)
+                .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
+                .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .eq(InsuranceApply::getId,smsCheckDTO.getBusinessId())
+                .last("limit 1");
+
+        InsuranceApply model = insuranceApplyJoinMapper.selectJoinOne(InsuranceApply.class,wrapper);
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        if(solutions.getType().equals(Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝闈炲鎵樹繚鏂规淇濆崟!");
+        }
+        if(!model.getUnionApplyTbdStatus().equals(Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍟嗘埛鏈笂浼犳垨宸茬缃�");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Constants.ApplyLogType applyLogType = null;
+        String info = "";
+        //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
+        if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+        }
+        Company company = user.getCompany();
+        if(debugModel){
+            company = companyMapper.selectById(model.getCompanyId());
+        }
+        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+        Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+                .eq(Multifile::getObjId,model.getId())
+                .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
+                .eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
+        if(f == null || StringUtils.isBlank(f.getFileurl())){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇纭涔︽枃浠跺け璐ワ紝璇疯仈绯诲晢鎴风‘璁ゆ姇淇濈敵璇蜂功鏄惁姝g‘锛�");
+        }
+        String url = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode()+f.getFileurl();
+        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+        String applyNo = signService.applySign(company.getName(),url,company.getName(),company.getCode(),company.getEmail(),model.getSignKeyword(),company.getSignId(),notifyUrl);
+        if(StringUtils.isBlank(applyNo) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        String link = signService.signLink(applyNo,company.getName(),company.getCode());
+        if(StringUtils.isBlank(link) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        InsuranceApply update= new InsuranceApply();
+        update.setId(model.getId());
+        update.setEditor(user.getId());
+        update.setEditDate(new Date());
+        update.setApplyTbdNo(applyNo);
+        insuranceApplyMapper.updateById(update);
+        return  link;
+    }
 
 }

--
Gitblit v1.9.3