From 545cc3a93547af47080440010c03b70ed7baabdd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 25 六月 2024 18:22:08 +0800
Subject: [PATCH] 提交一把

---
 server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java |  999 ++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 689 insertions(+), 310 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 ebd3268..b5effcc 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
@@ -1,6 +1,8 @@
 package com.doumee.service.business.impl;
 
+import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.constants.ResponseStatus;
@@ -93,11 +95,15 @@
     @Autowired
     private MemberMapper memberMapper;
     @Autowired
+    private MemberJoinMapper memberJoinMapper;
+    @Autowired
     private DuSolutionMapper duSolutionMapper;
     @Autowired
     private DuSolutionJoinMapper duSolutionJoinMapper;
     @Autowired
     private DuWorktypeMapper duWorktypeMapper;
+    @Autowired
+    private DuWorkTypeJoinMapper duWorkTypeJoinMapper;
 
     @Autowired
     private NoticesMapper noticesMapper;
@@ -105,6 +111,8 @@
     private UnionApplyJoinMapper unionApplyJoinMapper;
     @Autowired
     private UnionChangeJoinMapper unionChangeJoinMapper;
+    @Autowired
+    private CompanySolutionMapper companySolutionMapper;
 
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -113,24 +121,31 @@
             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.UPLOAD_INSURANCE.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();
+        if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+            if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+            update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
+        }else{
+            if( !(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
+            || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+            || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()))){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+            update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
+        }
+
         update.setEditDate(new Date());
         update.setEditor(user.getId());
-        update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
         update.setCheckDate(update.getEditDate());
         update.setCheckInfo(insuranceApply.getCheckInfo());
         update.setCheckUserId(user.getId());
@@ -212,6 +227,10 @@
         if(model.getApplyEndTime()== null || model.getStartTime().getTime()>model.getApplyEndTime().getTime() ){
             throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风敓鏁堝懆鏈熸椂闂翠笉绗﹀悎瑕佹眰锛岃纭鍚庝慨鏀归噸璇晘");
         }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
         //璁＄畻瀹為檯鎴鏃堕棿
         Date actEndTime = new Date(model.getApplyEndTime().getTime() + (insuranceApply.getStartTime().getTime() - model.getApplyStartTime().getTime()));
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -226,11 +245,17 @@
         update.setCode(insuranceApply.getCode());
         update.setEndTime(actEndTime);
         update.setStartTime(insuranceApply.getStartTime());
+        CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
+        countCyclePriceDTO.setSolutionsId(model.getSolutionId());
+        countCyclePriceDTO.setStartDate(insuranceApply.getStartTime());
+        update.setFinalEndTime(this.getCountCyclePriceVO(countCyclePriceDTO).getEndDate());
         insuranceApplyMapper.updateById(update);
 
         //淇敼鏄庣粏琛岀殑寮�濮嬬粨鏉熸棩鏈�
-        applyDetailMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda().set(ApplyDetail::getStartTime,insuranceApply.getStartTime())
-                .set(ApplyDetail::getEndTime,actEndTime).eq(ApplyDetail::getApplyId,model.getId()));
+        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)
@@ -249,6 +274,10 @@
         insuranceApply.getBaoxiandanFile().setType(Constants.TWO);
         multifileMapper.insert(insuranceApply.getBaoxiandanFile());
         update.setBaoxiandanFile(insuranceApply.getBaoxiandanFile());
+
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,Constants.NoticeObjectType.INSURANCE_APPLY.getKey())
+                .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+                .eq(Notices::getObjId,insuranceApply.getId()));
 
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD_INSURANCE;
         String info = "";
@@ -283,13 +312,29 @@
         if(CollectionUtils.isNotEmpty(applyDetailList)){
             List<MemberInsurance> memberInsuranceList = new ArrayList<>();
             for (ApplyDetail applyDetail:applyDetailList) {
+
+                //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+                this.checkMemberSolution(solutions.getBaseId(),applyDetail.getIdcardNo(),applyDetail.getMemberName(),update.getStartTime()
+                        ,update.getEndTime(),insuranceApply.getId());
+
                 MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
                 memberInsurance.setRelationType(Constants.ZERO);
                 memberInsuranceList.add(memberInsurance);
+
+                memberMapper.update(null,new UpdateWrapper<Member>()
+                        .lambda()
+                        .set(Member::getStartTime,memberInsurance.getStartTime())
+                        .set(Member::getEndTime,memberInsurance.getEndTime())
+                        .set(Member::getDuId,memberInsurance.getDuId())
+                        .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
+                        .eq(Member::getId, memberInsurance.getMemberId())
+                );
+
             }
             memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
         }
 
+        this.updateApplyCurrentFee(insuranceApply.getId(),null);
         return  1;
     }
 
@@ -369,6 +414,11 @@
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Constants.ApplyLogType applyLogType = null;
         String info = "";
+        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()));
         InsuranceApply update = new InsuranceApply();
         if(insuranceApply.getDealBackApply() ==1){
             //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
@@ -400,6 +450,15 @@
             }
             applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
             update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+
+
+            //閫氱煡浼佷笟 宸查��鍥�
+            Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+            if(Objects.nonNull(solutions)){
+                Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
+                        insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
+                noticesMapper.insert(notices);
+            }
         }
         update.setEditDate(new Date());
         update.setEditor(user.getId());
@@ -408,6 +467,7 @@
         update.setCheckUserId(user.getId());
         update.setId(model.getId());
         insuranceApplyMapper.updateById(update);
+
 
         ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
@@ -473,6 +533,8 @@
         update.setId(model.getId());
         update.setEditor(user.getId());
         update.setEditDate(new Date());
+        update.setCheckUserId(user.getId());
+        update.setCheckDate(new Date());
         update.setSignApplyNo(applyNo);
         insuranceApplyMapper.updateById(update);
         return  link;
@@ -517,15 +579,22 @@
         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);
+
+        CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+                .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+                .eq(CompanySolution::getSolutionId,model.getSolutionId())
+                .eq(CompanySolution::getCompanyId,model.getCompanyId())
+                .last("limit 1")
+        );
+        //鍟嗘埛寰呭姙
+        if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
+            Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+                    model.getId(),model.getSolutionsName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
             noticesMapper.insert(shopNotices);
         }
-
-
 
         Multifile f = new Multifile();
         f.setIsdeleted(Constants.ZERO);
@@ -557,11 +626,9 @@
     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);
 
@@ -579,7 +646,7 @@
         multifileMapper.insert(f);
 
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
-        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
                 ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
         return  f;
@@ -633,7 +700,6 @@
     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("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
@@ -658,7 +724,7 @@
 
         //鏁版嵁鏃ュ織
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
-        ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+        ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
                 ,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
 
@@ -738,7 +804,7 @@
         ApplyChange update = new ApplyChange();
         update.setEditDate(new Date());
         update.setEditor(model.getCreator());
-        update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
+        update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
         update.setCheckDate(update.getEditDate());
         update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
         update.setCheckUserId(model.getCreator());
@@ -750,7 +816,11 @@
         f.setCreator(model.getCreator());
         f.setObjId(update.getId());
         f.setCreateDate(update.getEditDate());
-        f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey());
+        if(model.getType().equals(Constants.ZERO)){
+            f.setObjType(Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey());
+        }else{
+            f.setObjType(Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey());
+        }
         f.setType(Constants.TWO);
         f.setFileurl(fileurl);
         f.setFileurlFull(fullurl);
@@ -842,8 +912,8 @@
         f.setType(Constants.TWO);
         f.setFileurl(fileurl);
         f.setFileurlFull(fullUrl);
-        f.setInfo("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�");
-        f.setName("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�.pdf");
+        f.setInfo("鎶曚繚鐢宠鍗� -鐢宠鍗�");
+        f.setName("鎶曚繚鐢宠鍗�.pdf");
         multifileMapper.insert(f);
 
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
@@ -1113,218 +1183,350 @@
 
     }
     @Override
-    public   void dealSignResult(NotifyDataReq data){
+    public   String dealSignResult(NotifyDataReq data){
         if(data.getApplyNo() == null ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+        if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )
+                || Constants.equalsInteger(data.getSignStatus(), Constants.TWO )){
             //濡傛灉宸蹭繚鍏�,鍙笅杞界绾﹂檮浠�
             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)
-                            .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.ZERO)
-                            .eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
-                            .last("limit 1" ));
-            if(model != null && Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
+           String r = dealXBTBBiz(path,data,"鐩翠繚-鎶曚繚鐢宠绛剧讲");
+           if(StringUtils.isNotBlank(r)){
+               return  r;
+           }
+            r = dealWTBQYQRSBiz(path,data,"濮旀墭淇�-浼佷笟鏂规纭涔︾缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBQYRYMQDBiz(path,data,"濮旀墭淇�-浼佷笟浜哄憳鍚嶅崟绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBTBSQBiz(path,data,"濮旀墭淇�-鎶曚繚鐢宠涔︾缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealZBJJBQYBiz(path,data,"鐩翠繚-鍔犲噺淇濅紒涓氱缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealWTBJJBQYBiz(path,data,"濮旀墭淇�-鍔犲噺淇濅紒涓氱缃�");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealHBDSHBiz(path,data,"鎶曚繚鍚堝苟鍗�-鍟嗘埛绛剧讲绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+            r = dealHBCHANGEQYBiz(path,data,"鍚堝苟鍔犲噺淇�/鎹㈠巶绛剧讲");
+            if(StringUtils.isNotBlank(r)){
+                return  r;
+            }
+        }
+        return "鏃犲鐞嗘暟鎹�";
+    }
+
+    private String dealHBCHANGEQYBiz(String path, NotifyDataReq data, String title) {
+        UnionChange unionChange = unionChangeJoinMapper.selectOne(
+                new MPJLambdaWrapper<UnionChange>()
+                        .selectAll(UnionChange.class)
+                        .eq(UnionChange::getSignApplyNo,data.getApplyNo())
+                        .last(" limit 1 "));
+        if(unionChange == null){
+            return null;
+        }
+        if( Constants.equalsInteger(unionChange.getStatus(),Constants.UnionChangeStatus.MERGE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
                 //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
-                String link = signService.linkFile(data.getApplyNo());
+                String link = signService.linkFile(unionChange.getSignApplyNo());
                 String fileUrl = uploadSignFile(link);
                 if(StringUtils.isBlank(fileUrl)){
                     //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                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());
-                String fileUrl = uploadSignFile(link);
-                if(StringUtils.isBlank(fileUrl)){
-                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
-                    return;
-                }
-                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;
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
                 }
                 uploadUnionChangeSignedFileDo(unionChange,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                unionChangeJoinMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
+                        .set(UnionChange::getSignApplyNo,null)
+                        .eq(UnionChange::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealHBDSHBiz(String path, NotifyDataReq data, String title) {
+        //鎶曚繚鍚堝苟鍗� 鍟嗘埛绛剧讲淇濆崟
+        UnionApply unionApply = unionApplyJoinMapper.selectOne(new QueryWrapper<UnionApply>()
+                .lambda().eq(UnionApply::getSignApplyNo,data.getApplyNo()).last(" limit 1 "));
+        if(unionApply == null){
+            return null;
+        }
+        if( Constants.equalsInteger(unionApply.getStatus(),Constants.UnionApplyStatus.WAIT_SIGNATURE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadUnionApplySignedFileDo(unionApply,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                unionApplyJoinMapper.update(null,new UpdateWrapper<UnionApply>().lambda()
+                        .set(UnionApply::getSignApplyNo,null)
+                        .eq(UnionApply::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+
+    }
+
+    private String dealWTBJJBQYBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 鍔犲噺淇濅紒涓氱缃�
+        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){
+            return null;
+        }
+        if( Constants.equalsInteger(applyChangeMemberList.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadChangeMemberListSignedFileDo(applyChangeMemberList,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
+                        .set(ApplyChange::getSignMemberListNo,null)
+                        .eq(ApplyChange::getSignMemberListNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealZBJJBQYBiz(String path, NotifyDataReq data, String title) {
+        //鐩翠繚 鍔犲噺淇濅紒涓氱缃�
+        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){
+            return null;
+        }
+        if( Constants.equalsInteger(applyChange.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadChangeSignedFileDo(applyChange,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                applyChangeMapper.update(null,new UpdateWrapper<ApplyChange>().lambda()
+                        .set(ApplyChange::getSignApplyNo,null)
+                        .eq(ApplyChange::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBTBSQBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 鎶曚繚鐢宠涔︾缃�
+        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(modelTBQSQ == null){
+            return null;
+        }
+        if( Constants.equalsInteger(modelTBQSQ.getUnionApplyTbdStatus(),Constants.ONE)){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadTBSQSSignedFileDo(modelTBQSQ,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getApplyTbdNo,null)
+                        .eq(InsuranceApply::getApplyTbdNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBQYRYMQDBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 浼佷笟绛剧讲浜哄憳鍚嶅崟
+        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){
+            return null;
+        }
+        if( Constants.equalsInteger(modelMemberList.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadApplyMemberListSignedFileDo(modelMemberList,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignMemberListNo,null)
+                        .eq(InsuranceApply::getSignMemberListNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    private String dealWTBQYQRSBiz(String path, NotifyDataReq data, String title) {
+        //濮旀墭淇� 浼佷笟鏂规纭涔�
+        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){
+            return null;
+        }
+        if(  Constants.equalsInteger(modelTBQRS.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title+"鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadFAQRSSignedFileDo(modelTBQRS,fileUrl,path+fileUrl);
+                return title+"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignQrsNo,null)
+                        .eq(InsuranceApply::getSignQrsNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
             }
 
-
-        }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()));
         }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
+    }
+
+    /**
+     * 鎶曚繚鐩翠繚鐢宠绛剧讲
+     * @param path
+     * @param data
+     * @return
+     */
+    private String dealXBTBBiz(String path, NotifyDataReq data,String title) {
+        InsuranceApply model = 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.ZERO)
+                        .eq(InsuranceApply::getSignApplyNo,data.getApplyNo())
+                        .last("limit 1" ));
+        if(model == null){
+            return null;
+        }
+        if(  Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())){
+            //瀹屾垚绛剧讲宸插畬鎴愭搷浣�
+            if(Constants.equalsInteger(data.getSignStatus(), Constants.THREE )){
+                String link = signService.linkFile(data.getApplyNo());
+                String fileUrl = uploadSignFile(link);
+                if(StringUtils.isBlank(fileUrl)){
+                    //濡傛灉涓嬭浇澶辫触锛屾竻闄ゅ悎鍚岋紝涓嬫绛剧珷閲嶆柊鐢熸垚鏂板悎鍚�
+                    return title + "鍚堝悓涓嬭浇澶辫触锛岀瓑寰呬笅娆℃帹閫佸鐞�";
+                }
+                uploadSignedFileDo(model,fileUrl,path+fileUrl);
+                return title +"鐘舵�佸鐞嗘垚鍔�";
+            }else{
+                //濡傛灉宸叉嫆绛撅紝娓呴櫎鍚堝悓锛屼笅娆＄绔犻噸鏂扮敓鎴愭柊鍚堝悓
+                insuranceApplyMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+                        .set(InsuranceApply::getSignApplyNo,null)
+                        .eq(InsuranceApply::getSignApplyNo,data.getApplyNo()));
+                return title+"鍚堝悓鎷掔澶勭悊鎴愬姛";
+            }
+
+        }
+        return  title+"鐘舵�佸凡娴佽浆锛屼笉鍋氬鐞�";
     }
 
 
@@ -1455,6 +1657,8 @@
             applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
             if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
                 update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
+            }else{
+                update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
             }
         }
         insuranceApplyMapper.updateById(update);
@@ -1510,6 +1714,18 @@
         if(!(solutions.getIsdeleted().equals(Constants.ZERO)||solutions.getStatus().equals(Constants.ZERO))){
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏂规淇℃伅宸茶绂佺敤");
         }
+        if(solutions.getValidType().equals(Constants.ZERO)){
+            if(DateUtil.getMontageDate(
+                    DateUtil.addDaysToDate(new Date(),solutions.getValidTypeNum()),1).getTime()
+                    >insuranceApply.getApplyStartTime().getTime()){
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"淇濆崟鐢熸晥璧锋湡閿欒");
+            }
+        }else{
+            if(DateUtil.getMontageDate(DateUtil.getNextMonthFirst(new Date()),1).getTime()>insuranceApply.getApplyStartTime().getTime()){
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"淇濆崟鐢熸晥璧锋湡閿欒");
+            }
+        }
+
         List<ApplyDetail> applyDetailList = insuranceApply.getApplyDetailList();
         //鍒ゆ柇鏄惁瀛樺湪閲嶅淇℃伅
         List<String> idCardList = applyDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList());
@@ -1534,22 +1750,25 @@
         insuranceApply.setCheckUserId(loginUserInfo.getId());
         insuranceApply.setStatus(insuranceApplyStatus.getKey());
         insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
-
         CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
         countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId());
         countCyclePriceDTO.setStartDate(insuranceApply.getStartTime());
         CountCyclePriceVO  countCyclePriceVO = this.getCountCyclePriceVO(countCyclePriceDTO);
         insuranceApply.setApplyEndTime(countCyclePriceVO.getEndDate());
         insuranceApply.setEndTime(countCyclePriceVO.getEndDate());
+        insuranceApply.setFinalEndTime(countCyclePriceVO.getEndDate());
         insuranceApplyMapper.insert(insuranceApply);
-
-
         //澶勭悊涓嬬骇鏁版嵁
-        this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO);
+        this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO,true);
         InsuranceApply updBean = new InsuranceApply();
         updBean.setId(insuranceApply.getId());
         updBean.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
         insuranceApplyMapper.updateById(updBean);
+
+//        if(1==1){
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+//        }
+
         //瀛樺偍鏃ュ織鏁版嵁
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.UPLOAD;
         String info =applyLogType.getInfo();
@@ -1568,14 +1787,19 @@
             //瀛樺偍骞冲彴寰呭姙
             Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
             noticesMapper.insert(notices);
+            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+                    .eq(CompanySolution::getSolutionId,solutions.getId())
+                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
+                    .last("limit 1")
+            );
             //鍟嗘埛寰呭姙
-            if(Objects.nonNull(solutions.getShopId())){
+            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
                 Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
-                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
+                        insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
                 noticesMapper.insert(shopNotices);
             }
         }
-
         return insuranceApply.getId();
     }
 
@@ -1641,7 +1865,7 @@
         }
 
         //澶勭悊涓嬬骇鏁版嵁
-        this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO);
+        this.dealApplyDetailData(insuranceApply,solutions,applyDetailList,loginUserInfo,countCyclePriceVO,false);
         insuranceApply.setFee(applyDetailList.stream().map(ApplyDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
         insuranceApplyMapper.updateById(insuranceApply);
         //瀛樺偍鏃ュ織鏁版嵁
@@ -1667,7 +1891,8 @@
 
 
 
-    public void dealApplyDetailData(InsuranceApply insuranceApply,Solutions solutions,List<ApplyDetail> applyDetailList,LoginUserInfo loginUserInfo,CountCyclePriceVO  countCyclePriceVO){
+    public void dealApplyDetailData(InsuranceApply insuranceApply,Solutions solutions,List<ApplyDetail> applyDetailList,
+                                    LoginUserInfo loginUserInfo,CountCyclePriceVO  countCyclePriceVO,Boolean checkNewData){
         //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
         List<DuSolution>  duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
                 .selectAll(DuSolution.class)
@@ -1676,22 +1901,68 @@
                 .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
                 .eq(DispatchUnit::getUnitStatus,Constants.ONE)
                 .eq(DuSolution::getIsdeleted,Constants.ZERO)
+                .eq(checkNewData,DispatchUnit::getDataType,Constants.TWO)
                 .eq(DuSolution::getStatus,Constants.ONE)
-                .eq(DuSolution::getSolutionId,insuranceApply.getSolutionId()));
+                .eq(DuSolution::getSolutionId,insuranceApply.getSolutionId())
+                .apply(" t1.BASE_ID in ( select du.id from dispatch_unit du where du.STATUS = 0 and du.ISDELETED = 0 ) ")
+        );
         if(!CollectionUtils.isNotEmpty(duSolutionList)){
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒版淳閬ｅ崟浣嶄俊鎭紝璇风‘淇濇淳閬ｅ崟浣嶅拰宸ヤ綔閰嶇疆骞跺鏍搁�氳繃锛�");
         }
         //鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
         List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
-        List<DuWorktype> duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
+        List<DuWorktype> duWorktypeList = duWorkTypeJoinMapper.selectJoinList(DuWorktype.class,new MPJLambdaWrapper<DuWorktype>()
+                .selectAll(DuWorktype.class)
+                .innerJoin(Worktype.class,Worktype::getId,DuWorktype::getWorkTypeId)
                 .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                 .eq(DuWorktype::getStatus,Constants.ONE)
+                .eq(checkNewData,Worktype::getDataType,Constants.TWO)
                 .in(DuWorktype::getDuSolutionId,duSolutionIdList));
         if(!CollectionUtils.isNotEmpty(duWorktypeList)){
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭紝璇风‘淇濇淳閬ｅ崟浣嶅拰宸ヤ綔閰嶇疆骞跺鏍搁�氳繃锛�");
         }
 
         if(CollectionUtils.isNotEmpty(applyDetailList)){
+            List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+                    .eq(Member::getCompanyId,insuranceApply.getCompanyId())
+                    .eq(Member::getIsdeleted,Constants.ZERO));
+
+            List<Member> addMemberList = new ArrayList<>();
+            for (int i = 0; i < applyDetailList.size(); i++) {
+                ApplyDetail applyDetail = applyDetailList.get(i);
+                Member member = null;
+                if(CollectionUtils.isNotEmpty(memberList)){
+                    Optional<Member>  optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+                    if(optional.isPresent()){
+                        member = optional.get();
+                    }
+                }
+                if(Objects.isNull(member)){
+                    member = new Member();
+                    member.setCreateDate(new Date());
+                    member.setCreator(loginUserInfo.getId());
+                    member.setIsdeleted(Constants.ZERO);
+                    member.setName(applyDetail.getMemberName());
+                    member.setCompanyId(insuranceApply.getCompanyId());
+                    member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
+                    if(!IdcardUtil.isValidCard(applyDetail.getIdcardNo())){
+                        throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鎶曚繚鍛樺伐銆�"+member.getName()+"銆戣韩浠借瘉淇℃伅銆�"+applyDetail.getIdcardNo()+"銆戦敊璇�");
+                    }
+                    member.setIdcardNo(applyDetail.getIdcardNo());
+                    member.setApplyId(insuranceApply.getId());
+                    member.setStartTime(applyDetail.getStartTime());
+                    member.setEndTime(applyDetail.getEndTime());
+                    member.setDuId(applyDetail.getDuId());
+                    member.setWorktypeId(applyDetail.getWorktypeId());
+                    addMemberList.add(member);
+                }
+                //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+                this.checkMemberSolution(solutions.getBaseId(),member.getIdcardNo(),member.getName(),insuranceApply.getStartTime(),insuranceApply.getEndTime(),insuranceApply.getId());
+            }
+            if(CollectionUtils.isNotEmpty(addMemberList)){
+                memberJoinMapper.insertBatchSomeColumn(addMemberList);
+            }
+            memberList.addAll(addMemberList);
             for (int i = 0; i < applyDetailList.size(); i++) {
                 ApplyDetail applyDetail = applyDetailList.get(i);
                 if(Objects.isNull(applyDetail)
@@ -1700,8 +1971,9 @@
                         ||Objects.isNull(applyDetail.getDuId())
                         ||Objects.isNull(applyDetail.getWorktypeId())
                 ){
-                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け");
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鎶曚繚鍛樺伐淇℃伅鏁版嵁缂哄け锛岃鎸夌収瑕佹眰濉啓鍛樺伐鐨勬湁鏁堜俊鎭紒");
                 }
+                applyDetail.setChangeStatus(Constants.ZERO);
                 applyDetail.setCreateDate(new Date());
                 applyDetail.setCreator(loginUserInfo.getId());
                 applyDetail.setIsdeleted(Constants.ZERO);
@@ -1709,31 +1981,16 @@
                 applyDetail.setEndTime(insuranceApply.getApplyEndTime());
                 applyDetail.setSortnum(i);
                 applyDetail.setApplyId(insuranceApply.getId());
-                Member member = new Member();
+                Member member = null;
                 if(Objects.isNull(applyDetail.getMemberId())){
+                    if(CollectionUtils.isNotEmpty(memberList)){
+                        Optional<Member>  optional = memberList.stream().filter(m->m.getIdcardNo().equals(applyDetail.getIdcardNo())).findFirst();
+                        if(optional.isPresent()){
+                            member = optional.get();
+                        }
+                    }
                     //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
-                    member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
-                            .eq(Member::getCompanyId,insuranceApply.getCompanyId())
-                            .eq(Member::getIsdeleted,Constants.ZERO)
-                            .eq(Member::getIdcardNo,applyDetail.getIdcardNo())
-                            .last(" limit 1")
-                    );
-                    if(Objects.isNull(member)){
-                        member = new Member();
-                        member.setCreateDate(new Date());
-                        member.setCreator(loginUserInfo.getId());
-                        member.setIsdeleted(Constants.ZERO);
-                        member.setName(applyDetail.getMemberName());
-                        member.setCompanyId(insuranceApply.getCompanyId());
-                        member.setSex(Constants.getSexByIdCard(applyDetail.getIdcardNo()));
-                        member.setIdcardNo(applyDetail.getIdcardNo());
-                        member.setApplyId(insuranceApply.getId());
-                        member.setStartTime(applyDetail.getStartTime());
-                        member.setEndTime(applyDetail.getEndTime());
-                        member.setDuId(applyDetail.getDuId());
-                        member.setWorktypeId(applyDetail.getWorktypeId());
-                        memberMapper.insert(member);
-                    }else{
+                    if(!Objects.isNull(member)){
                         member.setApplyId(insuranceApply.getId());
                         member.setDuId(applyDetail.getDuId());
                         member.setWorktypeId(applyDetail.getWorktypeId());
@@ -1769,24 +2026,92 @@
                 //鑾峰彇璁＄畻鎬诲ぉ鏁�
                 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(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭姇淇濇�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
                 }
                 applyDetail.setPrice(
-                        applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
+                        applyDetail.getFee().divide(new BigDecimal(maxDays),7,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()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
                 }
                 if(duWorktypeList.stream().filter(d->d.getWorkTypeId().equals(applyDetail.getWorktypeId()))
                         .collect(Collectors.toList()).size()<=Constants.ZERO){
-                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"銆�"+applyDetail.getMemberName()+applyDetail.getIdcardNo()+"銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
                 }
             }
             applyDetailJoinMapper.insertBatchSomeColumn(applyDetailList);
         }
     }
 
+
+    /**
+     * 鏌ヨ 浼氬憳淇℃伅鍦ㄦ柟妗堜笅鏄惁瀛樺湪鍐茬獊鏁版嵁
+     * @param solutionId
+     * @param startTime
+     * @param endTime
+     */
+    @Override
+    public void checkMemberSolution(Integer solutionId,String idCode,String memberName,Date startTime,Date endTime,Integer applyId){
+        List<ApplyDetail> applyDetailList = new ArrayList<ApplyDetail>();
+        try {
+            applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
+                    new MPJLambdaWrapper<ApplyDetail>()
+                            .selectAll(ApplyDetail.class)
+                            .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
+                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .eq(ApplyDetail::getIdcardNo,idCode)
+                            .eq(Solutions::getBaseId,solutionId)
+                            .ne(Objects.nonNull(applyId),InsuranceApply::getId,applyId)
+                            .notIn(InsuranceApply::getStatus
+                                    ,Constants.InsuranceApplyStatus.CLOSE.getKey()
+                                    ,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
+                            .apply(" ( " +
+                                    " '"+DateUtil.getPlusTime(startTime)+"'  <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(endTime)+"' " +
+                                    " or " +
+                                    "  ( '"+DateUtil.getPlusTime(startTime)+"' < t.end_time AND t.end_time < '"+DateUtil.getPlusTime(endTime)+"' )  " +
+                                    " or " +
+                                    " ( '"+DateUtil.getPlusTime(startTime)+"' > t.start_time AND '"+DateUtil.getPlusTime(endTime)+"' < t.end_time )" +
+                                    " ) " ));
+        }catch (Exception e){
+        }
+        if(applyDetailList.size() >Constants.ZERO){
+            ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ュ憳宸ャ��"+memberName+" "+idCode+"銆戝湪璇ヤ繚闄╂柟妗堜笅宸插瓨鍦ㄦ姇淇濊褰曪紝鏃犳硶杩涜璇ユ搷浣�");
+        };
+    }
+
+    public static void checkStaticMemberSolution(Integer solutionId,String idCode,String memberName,Date startTime,
+                                                 Date endTime,ApplyDetailJoinMapper applyDetailJoinMapper){
+        List<ApplyDetail> applyDetailList = new ArrayList<ApplyDetail>();
+        try {
+            applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
+                    new MPJLambdaWrapper<ApplyDetail>()
+                            .selectAll(ApplyDetail.class)
+                            .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
+                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+                            .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                            .eq(ApplyDetail::getIdcardNo,idCode)
+                            .eq(Solutions::getBaseId,solutionId)
+                            .notIn(InsuranceApply::getStatus
+                                    ,Constants.InsuranceApplyStatus.CLOSE.getKey()
+                                    ,Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
+                            .apply(" ( " +
+                                    " '"+DateUtil.getPlusTime(startTime)+"'  <= t.start_time AND t.start_time < '"+DateUtil.getPlusTime(endTime)+"' " +
+                                    " or " +
+                                    "  ( '"+DateUtil.getPlusTime(startTime)+"' < t.end_time AND t.end_time < '"+DateUtil.getPlusTime(endTime)+"' )  " +
+                                    " or " +
+                                    " ( '"+DateUtil.getPlusTime(startTime)+"' > t.start_time AND '"+DateUtil.getPlusTime(endTime)+"' < t.end_time )" +
+                                    " ) " ));
+        }catch (Exception e){
+
+        }
+        if(applyDetailList.size() >Constants.ZERO){
+            ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ュ憳宸ャ��"+memberName+" "+idCode+"銆戝湪璇ヤ繚闄╂柟妗堜笅宸插瓨鍦ㄦ姇淇濊褰曪紝鏃犳硶杩涜璇ユ搷浣�");
+        };
+    }
 
     @Override
     public void deleteById(Integer id) {
@@ -1844,18 +2169,21 @@
             return  new ArrayList<>();
         }
         List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
-        if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
+        if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DCD.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
-        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DSP.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
-        }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.BZZ.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
-        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YTH.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
-        }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGB.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
-        }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DQYQZ.getKey())){
             statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
+        }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGQ.getKey())){
+            statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
+            statusList.add(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
         }
 
         return statusList;
@@ -1878,9 +2206,10 @@
         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(DISTINCT(ad.MEMBER_ID)) 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");
+        queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum");
         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  = 1 and td.INSURANCE_APPLY_ID = t.id ),0) as taxesMoney");
+            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 = 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);
@@ -1889,9 +2218,14 @@
         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());
+        if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
+            //濡傛灉鏄凡閬庢湡
+//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
             queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
+        }else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
+            //濡傛灉鏄繚闅滀腑
+//            queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+            queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
 
@@ -1900,12 +2234,12 @@
             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());
+            if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType().equals(0)){
+                queryWrapper.exists("select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=t1.base_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 (" +
+                queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs left join solutions s on cs.solution_id=s.id where cs.isdeleted=0 and s.base_id=t1.base_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
                         "t1.type=1 and t1.shop_id="+loginUserInfo.getCompanyId()+"))") ;
             }
         }else{
@@ -1915,6 +2249,9 @@
                 queryWrapper.eq(InsuranceApply::getCompanyId, -1);
             }
             queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+        }
+        if (pageWrap.getModel().getCompanyId() != null) {
+            queryWrapper.eq(InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
         }
         if (pageWrap.getModel().getSolutionId() != null) {
             queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
@@ -1975,7 +2312,8 @@
 
     public void    initApplyStatus(InsuranceApply apply){
         apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
-        if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+        if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+        || Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
             //濡傛灉宸插畬鎴�
             if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
                 apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
@@ -1989,12 +2327,14 @@
     @Override
     public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) {
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
         MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(InsuranceApply.class);
         queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
         queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
         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 count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum");
         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 ");
@@ -2002,6 +2342,7 @@
         queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
         queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
         queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
+        queryWrapper.eq(model.getBaseSolutionId()!=null,Solutions::getBaseId,model.getBaseSolutionId());
         //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
         if(loginUserInfo.getType().equals(Constants.ONE)){
             queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
@@ -2139,6 +2480,7 @@
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
                 .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(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ) as guaranteeNum")
                 .select(" t3.name as shopName")
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -2190,7 +2532,8 @@
     private void setServiceDays(InsuranceApply insuranceApply) {
         //璁剧疆鍦ㄤ繚鏃堕暱锛堝ぉ鏁帮級
         insuranceApply.setServiceDays(Constants.ZERO);
-        if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+        if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+        || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
             //濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
             if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
                 insuranceApply.setServiceDays(
@@ -2259,7 +2602,10 @@
         MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
                 .selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+                .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
                 .selectAs(Company::getName,InsuranceApply::getCompanyName)
+                .select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad  where ad.apply_id = t.id ) as insureNum")
+                .select(" isnull(( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id  and a.status in ( 5 , 27 )  where ad.apply_id = t.id and ad.END_TIME > now() ),0) as guaranteeNum")
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(InsuranceApply::getId,model.getId())
@@ -2276,11 +2622,12 @@
                 .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
                 .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                 .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+                .ge(ApplyDetail::getEndTime,DateUtil.getPlusTime2(new Date()))
                 .eq(ApplyDetail::getApplyId,model.getId());
         //鏌ヨ鏄庣粏
         List<ApplyDetail> detailList =applyDetailJoinMapper.selectJoinList(ApplyDetail.class,wrapper1);
         if(detailList!=null){
-            insuranceApply.setInsureNum(detailList.size());
+//            insuranceApply.setInsureNum(detailList.size());
             insuranceApply.setApplyDetailList(detailList);
         }
         insuranceApply.setRemark(model.getRemark());
@@ -2318,7 +2665,10 @@
             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()))){
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+                    || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+                    || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
             }
             if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())){
@@ -2331,20 +2681,41 @@
                 insuranceApplyStatus =  Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
             }
 
+            else  if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+            || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+            || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
+                insuranceApplyStatus =  Constants.InsuranceApplyStatus.WTB_RETURN;
+            }
+
             //瀛樺偍寰呭姙淇℃伅
             //鍒犻櫎鍏朵粬寰呭姙
             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);
+
+
+            CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+                    .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+                    .eq(CompanySolution::getSolutionId,solutions.getId())
+                    .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
+                    .last("limit 1")
+            );
             //鍟嗘埛寰呭姙
-            if(Objects.nonNull(solutions.getShopId())){
+            if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
                 Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
-                        insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
+                        insuranceApply.getId(),solutions.getName(),companySolution.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())){
@@ -2353,7 +2724,10 @@
             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()))){
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
+                    ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
+            )
+            ){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!");
             }
             //鍒犻櫎鍏朵粬寰呭姙
@@ -2388,7 +2762,8 @@
         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()))
+                .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 ");
 
@@ -2404,41 +2779,44 @@
      */
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
-    public void updateApplyCurrentFee(Integer id){
+    public void updateApplyCurrentFee(Integer id,Integer unionId){
         List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
                 .eq(InsuranceApply::getIsdeleted,Constants.ZERO)
-                .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
+                .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                 .eq(!Objects.isNull(id),InsuranceApply::getId,id)
+                .eq(!Objects.isNull(unionId),InsuranceApply::getUnionApplyId,unionId)
                 .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")
         );
-
         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()
+                                .ne(ApplyDetail::getChangeStatus,Constants.TWO)
                                 .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);
-                        BigDecimal fee = applyDetail.getFee();
+                        BigDecimal fee =  Objects.isNull(insuranceApply.getServerCost())?
+                                solutions.getPrice():
+                                solutions.getPrice().add(insuranceApply.getServerCost());
+                        //鍦ㄥ紑濮嬬粨鏉熸棩鏈熶箣闂�
                         if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
-                            Integer days =  DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
-                            applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
-                            //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+                            applyDetail.setCurrentFee(Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),applyDetail.getStartTime()));
                             applyDetailMapper.updateById(applyDetail);
-                        }else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
-                            applyDetail.setCurrentFee(fee);
+                        }else  if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
+                            //鍦ㄧ粨鏉熸棩鏈熶箣鍚�
+                            applyDetail.setCurrentFee(applyDetail.getFee());
                             applyDetailMapper.updateById(applyDetail);
                         }
-                        sumAmount = sumAmount.add(applyDetail.getCurrentFee());
+                        if(Constants.equalsInteger(applyDetail.getChangeStatus(),Constants.ZERO) || applyDetail.getEndTime().getTime()>System.currentTimeMillis()){
+                            sumAmount = sumAmount.add(applyDetail.getCurrentFee());
+                        }
                     }
                 }
                 insuranceApply.setCurrentFee(sumAmount);
@@ -2498,13 +2876,13 @@
     public  String getSignTBQRSLink(SmsCheckDTO smsCheckDTO) {
         if(Objects.isNull(smsCheckDTO)
             || Objects.isNull(smsCheckDTO.getBusinessId())
-                || StringUtils.isBlank(smsCheckDTO.getCode())
+//                || StringUtils.isBlank(smsCheckDTO.getCode())
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        if(!debugModel){
-            smsEmailService.validateCode(smsCheckDTO.getCode());
-        }
+//        if(!debugModel){
+//            smsEmailService.validateCode(smsCheckDTO.getCode());
+//        }
         MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
                 .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)
@@ -2580,6 +2958,7 @@
                 .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                 .isNull(ApplyDetail::getFromId)
                 .eq(ApplyDetail::getApplyId,model.getId())
+                .orderByAsc(ApplyDetail::getId)
         );
         model.setApplyDetailList(applyDetailList);
         return model;
@@ -2594,14 +2973,14 @@
     public String getMemberListOnlineSignLink(SmsCheckDTO smsCheckDTO) {
         if(Objects.isNull(smsCheckDTO)
                 || Objects.isNull(smsCheckDTO.getBusinessId())
-                || StringUtils.isBlank(smsCheckDTO.getCode())
+//                || StringUtils.isBlank(smsCheckDTO.getCode())
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         //楠岃瘉 楠岃瘉鐮�
-        if(!debugModel){
-            smsEmailService.validateCode(smsCheckDTO.getCode());
-        }
+//        if(!debugModel){
+//            smsEmailService.validateCode(smsCheckDTO.getCode());
+//        }
         InsuranceApply model = this.queryApplyDetail(smsCheckDTO.getBusinessId());
         if(Objects.isNull(model)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
@@ -2657,14 +3036,14 @@
     public  String getSignWTBTBDLink(SmsCheckDTO smsCheckDTO) {
         if(Objects.isNull(smsCheckDTO)
                 || Objects.isNull(smsCheckDTO.getBusinessId())
-                || StringUtils.isBlank(smsCheckDTO.getCode())
+//                || StringUtils.isBlank(smsCheckDTO.getCode())
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         //楠岃瘉 楠岃瘉鐮�
-        if(!debugModel){
-            smsEmailService.validateCode(smsCheckDTO.getCode());
-        }
+//        if(!debugModel){
+//            smsEmailService.validateCode(smsCheckDTO.getCode());
+//        }
         MPJLambdaWrapper wrapper=  new MPJLambdaWrapper<InsuranceApply>()
                 .selectAll(InsuranceApply.class)
                 .selectAs(Solutions::getSignKeyword,InsuranceApply::getSignKeyword)

--
Gitblit v1.9.3