From bcae1eeb59ff2094f14043a0488b1abb25130831 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 六月 2025 14:23:02 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java |  824 ++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 596 insertions(+), 228 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 5df7fa5..7372c36 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.util.IdcardUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.annotation.excel.ExcelExporter;
 import com.doumee.core.constants.ResponseStatus;
@@ -14,37 +17,31 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
-import com.doumee.dao.business.dto.*;
+import com.doumee.dao.business.dto.ApplyChangeCyclePriceDTO;
+import com.doumee.dao.business.dto.ApplyChangeOptDTO;
+import com.doumee.dao.business.dto.SaveUnionChangeDTO;
+import com.doumee.dao.business.dto.SmsCheckDTO;
 import com.doumee.dao.business.join.*;
 import com.doumee.dao.business.model.*;
-import com.doumee.dao.business.vo.ChangeDealTypeVO;
 import com.doumee.dao.business.vo.CountCyclePriceVO;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.service.business.ApplyChangeService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.InsuranceApplyService;
 import com.doumee.service.business.SmsEmailService;
 import com.doumee.service.business.third.SignService;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -82,6 +79,9 @@
     private ApplyDetailJoinMapper applyDetailJoinMapper;
 
     @Autowired
+    private SettleClaimsMapper settleClaimsMapper;
+
+    @Autowired
     private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
 
     @Autowired
@@ -90,6 +90,8 @@
     @Autowired
     private MemberMapper memberMapper;
 
+    @Autowired
+    private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;
     @Autowired
     private MultifileMapper multifileMapper;
     @Autowired
@@ -112,7 +114,7 @@
     @Autowired
     private NoticesMapper noticesMapper;
     /**
-     * 骞冲彴閫�鍥炴姇淇�
+     * 骞冲彴閫�鍥炵敵璇�
      * @param param
      * @return
      */
@@ -191,9 +193,11 @@
         if(param.getId() == null
                 || param.getValidCode() == null
                 || param.getApplyStartTime() == null
-                || param.getPidanFile() == null
-                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
-                ||StringUtils.isBlank( param.getPidanFile() .getName())){
+                || CollectionUtils.isEmpty(param.getPidanFileList())
+//                || param.getPidanFile() == null
+//                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+//                ||StringUtils.isBlank( param.getPidanFile() .getName())
+        ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
 
@@ -206,11 +210,10 @@
             if(param.getDelValidTime() == null){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST);
             }
-            if(!(param.getApplyStartTime().getTime()>insuranceApply.getStartTime().getTime()&&param.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
+            if(!(param.getApplyStartTime().getTime()>=insuranceApply.getStartTime().getTime()&&param.getApplyStartTime().getTime()<=insuranceApply.getEndTime().getTime())){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
             }
-
-            if(!(param.getDelValidTime().getTime()>insuranceApply.getStartTime().getTime()&&param.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
+            if(!(param.getDelValidTime().getTime()>=insuranceApply.getStartTime().getTime()&&param.getDelValidTime().getTime()<=insuranceApply.getEndTime().getTime())){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰噺鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
             }
         }else{
@@ -244,14 +247,20 @@
         update.setApplyStartTime(param.getApplyStartTime());
         update.setDelValidTime(param.getDelValidTime());
         update.setCode(model.getCode());
-
-        param.getPidanFile().setIsdeleted(Constants.ZERO);
-        param.getPidanFile().setCreator(user.getId());
-        param.getPidanFile().setObjId(update.getId());
-        param.getPidanFile().setCreateDate(update.getEditDate());
-        param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
-        param.getPidanFile().setType(Constants.TWO);
-        multifileMapper.insert(param.getPidanFile());
+        List<Multifile> pidanFileList = param.getPidanFileList();
+        for (Multifile pidanFile:pidanFileList) {
+            if(StringUtils.isBlank( pidanFile.getFileurl())
+                ||StringUtils.isBlank( pidanFile .getName())) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵瑰崟鏂囦欢鍙傛暟閿欒");
+            }
+            pidanFile.setIsdeleted(Constants.ZERO);
+            pidanFile.setCreator(user.getId());
+            pidanFile.setObjId(update.getId());
+            pidanFile.setCreateDate(update.getEditDate());
+            pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+            pidanFile.setType(Constants.TWO);
+        }
+        multifileMapper.insert(pidanFileList);
         update.setApplyId(model.getApplyId());
 
 
@@ -265,9 +274,6 @@
 
         applyChangeMapper.updateById(update);
 
-//        if(1==1){
-//            throw new BusinessException(ResponseStatus.DATA_EMPTY);
-//        }
 
 
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
@@ -297,10 +303,12 @@
     public     Integer editPidan(ApplyChange param) {
         if(param.getId() == null
                 || param.getValidCode() == null
-                || param.getPidanFile() == null
                 || param.getCheckInfo() == null
-                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
-                ||StringUtils.isBlank( param.getPidanFile() .getName())){
+                || CollectionUtils.isEmpty(param.getPidanFileList())
+//                || param.getPidanFile() == null
+//                ||StringUtils.isBlank( param.getPidanFile().getFileurl())
+//                ||StringUtils.isBlank( param.getPidanFile() .getName())
+        ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
 
@@ -338,13 +346,29 @@
                 .eq(Multifile::getObjId,update.getId())
                 .eq(Multifile::getObjType,Constants.MultiFile.CA_PD_PDF.getKey())
         );
-        param.getPidanFile().setIsdeleted(Constants.ZERO);
-        param.getPidanFile().setObjId(update.getId());
-        param.getPidanFile().setCreator(user.getId());
-        param.getPidanFile().setCreateDate(update.getEditDate());
-        param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
-        param.getPidanFile().setType(Constants.TWO);
-        multifileMapper.insert(param.getPidanFile());
+
+        List<Multifile> pidanFileList = param.getPidanFileList();
+        for (Multifile pidanFile:pidanFileList) {
+            if(StringUtils.isBlank( pidanFile.getFileurl())
+                    ||StringUtils.isBlank( pidanFile .getName())) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎵瑰崟鏂囦欢鍙傛暟閿欒");
+            }
+            pidanFile.setIsdeleted(Constants.ZERO);
+            pidanFile.setCreator(user.getId());
+            pidanFile.setObjId(update.getId());
+            pidanFile.setCreateDate(update.getEditDate());
+            pidanFile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+            pidanFile.setType(Constants.TWO);
+        }
+        multifileMapper.insert(param.getPidanFileList());
+
+//        param.getPidanFile().setIsdeleted(Constants.ZERO);
+//        param.getPidanFile().setObjId(update.getId());
+//        param.getPidanFile().setCreator(user.getId());
+//        param.getPidanFile().setCreateDate(update.getEditDate());
+//        param.getPidanFile().setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+//        param.getPidanFile().setType(Constants.TWO);
+//        multifileMapper.insert(param.getPidanFile());
 
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PALTFORM_EDIT_PIDAN;
         String info =  applyLogType.getInfo();
@@ -420,6 +444,7 @@
             memberInsurance.setRelationType(Constants.ONE);
             memberInsurance.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
             memberInsurance.setRelationId(oldModel.getId());
+            memberInsurance.setIsValid(Constants.ZERO);
             memberInsuranceJoinMapper.insert(memberInsurance);
 
             applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
@@ -573,12 +598,6 @@
         if(Objects.isNull(solutions)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
         }
-//        if(solutions.getDataType().equals(Constants.ONE)){
-//            solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
-//            if(Objects.isNull(solutions)){
-//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
-//            }
-//        }
         List<ApplyChagneDetail> addList = detailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ZERO)).collect(Collectors.toList());
         List<ApplyChagneDetail> reduceList = detailList.stream().filter(f->Constants.equalsInteger(f.getType(),Constants.ONE)).collect(Collectors.toList());
         //鍑忎繚涓氬姟
@@ -594,40 +613,49 @@
                     .eq(ApplyDetail::getMemberId, detail.getMemberId())
                     .orderByDesc(ApplyDetail::getCreateDate)
                     .last("limit 1"));
-            if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
+//            if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()) {
+//                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+//            }
+//            if(!(oldModel.getStartTime().getTime()<=update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
+//                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝噺淇濇棩鏈熸湭鍦ㄤ繚鍗曡褰曟棩鏈熶腑锛�");
+//            }
+            if (oldModel == null || oldModel.getEndTime() == null || oldModel.getEndTime().getTime() < update.getDelValidTime().getTime()) {
                 throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
             }
-            if(!(oldModel.getStartTime().getTime()<update.getDelValidTime().getTime()&& oldModel.getEndTime().getTime()>=update.getDelValidTime().getTime())){
-                throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝噺淇濇棩鏈熸湭鍦ㄤ繚鍗曡褰曟棩鏈熶腑锛�");
-            }
-
-            Date delValidTime = oldModel.getStartTime().compareTo(update.getDelValidTime())!=0?
-                    DateUtil.getMontageDate(update.getDelValidTime(), 3):
-                    DateUtil.getMontageDate(update.getDelValidTime(), 2);
-
             BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
                     solutions.getPrice():
                     solutions.getPrice().add(insuranceApply.getServerCost());
-            // 鍑忎繚鍚� 鎬昏垂鐢�
-            BigDecimal updateFee =  Constants.reduceFee(
-                    solutions,
-                    sumFee
-                    ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
-            ) ;
+            // 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
+            BigDecimal updateFee = BigDecimal.ZERO;
+            // 鍑忎繚鍚� 鎵瑰崟鏃ユ湡  榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡  00:00:00
+            Date delValidTime = update.getDelValidTime();
             //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
             BigDecimal updateCurrentFee = BigDecimal.ZERO;
-            if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),oldModel.getStartTime()) > 0) {
+            //濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
+            if(update.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
+                //鎵瑰崟鏃ユ湡 澶т簬 淇濆崟寮�鏃ユ湡  鑾峰彇瀹為檯鐨勬壒鍗曠粨鏉熸棩鏈� 璁＄畻瀹為檯鍑忎繚鍚庢�昏垂鐢�
+                delValidTime = DateUtil.getMontageDate(update.getDelValidTime(), 3);
+                updateFee =  Constants.reduceFee(
+                        solutions,
+                        sumFee
+                        ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),delValidTime
+                ) ;
+            }else{
+                delValidTime  = oldModel.getStartTime();
+                updateFee = BigDecimal.ZERO;
+            }
+            if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
                 //// 2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
                 updateCurrentFee = Constants.produceFee(solutions,sumFee,insuranceApply.getStartTime(),insuranceApply.getEndTime(),
                         oldModel.getStartTime()
                 );
             }
-
             UpdateWrapper<ApplyDetail> updateWrapper = new UpdateWrapper<ApplyDetail>();
             updateWrapper.lambda()
                     .setSql(" fee = " + updateFee)
                     .setSql(" current_fee = " + updateCurrentFee)
                     .set(ApplyDetail::getEndTime, delValidTime)
+                    .set(update.getDelValidTime().getTime() <= oldModel.getStartTime().getTime(),ApplyDetail::getChangeStatus,Constants.TWO)
                     .set(ApplyDetail::getEditor, update.getEditor())
                     .set(ApplyDetail::getEditDate, update.getEditDate())
                     .eq(ApplyDetail::getId, oldModel.getId());
@@ -653,12 +681,30 @@
             totalFee = totalFee.add(updateFee).subtract(oldModel.getFee()).add(reduceMoney);
             currentFee = currentFee.add(updateCurrentFee);
 
+
+
+            List<MemberInsurance> oldMemberInsurance =   memberInsuranceJoinMapper.selectList(
+                    new QueryWrapper<MemberInsurance>().lambda()
+                            .eq(MemberInsurance::getIsValid,Constants.ZERO)
+                            .eq(MemberInsurance::getRelationId,oldModel.getId()));
+            for (MemberInsurance memberInsurance:oldMemberInsurance) {
+                //璁板綍鏁版嵁鏃╀簬鎵瑰崟鏃ユ湡
+                if(memberInsurance.getStartTime().getTime()>delValidTime.getTime()){
+                    memberInsurance.setIsValid(Constants.ONE);
+                }else if(memberInsurance.getEndTime().getTime()>=delValidTime.getTime()
+                && memberInsurance.getStartTime().getTime()<=delValidTime.getTime()){
+                    memberInsurance.setFee(updateFee);
+                    memberInsurance.setEndTime(delValidTime);
+                }
+                memberInsuranceJoinMapper.updateById(memberInsurance);
+            }
+
             //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
-            memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
-                    .setSql(" fee = " + updateFee)
-                    .set(MemberInsurance::getEndTime, delValidTime)
-                    .eq(MemberInsurance::getRelationId, oldModel.getId())
-            );
+//            memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
+//                    .setSql(" fee = " + updateFee)
+//                    .set(MemberInsurance::getEndTime, delValidTime)
+//                    .eq(MemberInsurance::getRelationId, oldModel.getId())
+//            );
 
             //淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
             applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
@@ -684,7 +730,7 @@
             }
             //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
             InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
-                    member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
+                    member.getId(),member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
                     applyDetailJoinMapper);
 
             //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
@@ -692,13 +738,6 @@
                     .lambda()
                     .eq(ApplyDetail::getApplyId,update.getApplyId())
                     .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
-//                    .apply(" ( " +
-//                            " '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"'  <= t.start_time AND t.start_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' " +
-//                            " or " +
-//                            "  ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"' < t.end_time AND t.end_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' )  " +
-//                            " or " +
-//                            " ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(update.getApplyStartTime(),1))+"' > t.start_time AND '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(detail.getEndTime(),2))+"' < t.end_time )" +
-//                            " ) " )
                     .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(),1))
                     .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
             )>Constants.ZERO){
@@ -766,7 +805,7 @@
         }
 
         if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
-            memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
+            memberInsuranceJoinMapper.insert(memberInsuranceList);
         }
 
         if (totalFee.compareTo(new BigDecimal(0)) != 0) {
@@ -778,13 +817,12 @@
                     .set(InsuranceApply::getEditDate, update.getEditDate())
                     .eq(InsuranceApply::getId, update.getApplyId())
             );
-
-            update.setFee(totalFee);
         }
+        update.setFee(totalFee);
     }
 
     /**
-     * 骞冲彴閫�鍥炴姇淇�
+     * 骞冲彴閫�鍥炵敵璇�
      * @param param
      * @return
      */
@@ -889,9 +927,9 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        if (!loginUserInfo.getType().equals(Constants.ONE)) {
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
-        }
+//        if (!loginUserInfo.getType().equals(Constants.ONE)) {
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+//        }
 
         InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
         if (Objects.isNull(insuranceApply)) {
@@ -905,22 +943,12 @@
         if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
         }
-//        if (DateUtil.compareDate(applyChange.getValidTime(),insuranceApply.getStartTime()) >= Constants.ZERO) {
-//            //濡傛灉淇濆崟灏氭湭鐢熸晥锛岃缃湡鏈涚敓鏁堟棩鏈熶负淇濆崟鐢熸晥寮�濮嬫椂闂�
-//            applyChange.setValidTime(insuranceApply.getStartTime());
-//        }
         Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
         if(Objects.isNull(solutions)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
         }
-//        if(solutions.getDataType().equals(Constants.ONE)){
-//            solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
-//            if(Objects.isNull(solutions)){
-//                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
-//            }
-//        }
         CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
-                .eq(CompanySolution::getCompanyId,loginUserInfo.getCompanyId())
+                .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
                 .eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
                 .eq(CompanySolution::getIsdeleted,Constants.ZERO)
                 .last(" limit 1 ")
@@ -928,16 +956,10 @@
         if(Objects.isNull(companySolution)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
         }
-        //鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
-//        if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChange.getValidTime()) >= Constants.ZERO
-//                && DateUtil.compareDate( applyChange.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
-//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
-//        }
         //鏌ヨ淇濆崟涓嬫槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁
         if(applyChangeMapper.selectCount(new QueryWrapper<ApplyChange>().lambda()
                 .eq(ApplyChange::getApplyId,insuranceApply.getId())
                 .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey(),Constants.ApplyChangeStatus.CLOSE.getKey())
-
         )>Constants.ZERO){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
         };
@@ -966,11 +988,9 @@
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_COMPANY_COMMIT;
         ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),"",applyChange.getId(),applyLogType.getKey(), null, null);
         applyLogMapper.insert(log);
-
 //        if(1==1){
-//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
+//            throw new BusinessException(ResponseStatus.DATA_EMPTY );
 //        }
-
         return applyChange.getId();
     }
 
@@ -994,9 +1014,9 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        if (!loginUserInfo.getType().equals(Constants.ONE)) {
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
-        }
+//        /*if (!loginUserInfo.getType().equals(Constants.ONE)) {
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+//        }*/
         ApplyChange dbApplyChange = applyChangeMapper.selectById(applyChange.getId());
         if(Objects.isNull(dbApplyChange)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -1028,7 +1048,8 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
         }
         if(solutions.getDataType().equals(Constants.ONE)){
-            solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+            solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda()
+                    .eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
             if(Objects.isNull(solutions)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
             }
@@ -1113,12 +1134,14 @@
                     applyChange.getDelValidTime()
             );
         }
-
     }
 
+    private static Logger logger = LoggerFactory.getLogger(ApplyChangeServiceImpl.class);
 
     public BigDecimal dealApplyChangeData(ApplyChange applyChange,InsuranceApply insuranceApply
             ,CompanySolution companySolution,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal fee){
+        Long start = System.currentTimeMillis();
+        logger.error("澶勭悊鍔犲噺淇濅繚鍗曟暟鎹紑濮嬫椂闂�:=========================>"+start);
         if(Constants.equalsInteger(applyChange.getType(),Constants.ZERO)){
             if(Objects.nonNull(solutions.getDelOnlyReplace())&& solutions.getDelOnlyReplace().equals(Constants.ONE)){
                 if(applyChange.getDelDetailList().size() > applyChange.getAddDetailList().size()){
@@ -1126,27 +1149,40 @@
                 }
             }
         }
-        //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
-        List<DuSolution>  duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
-                .selectAll(DuSolution.class)
-                .innerJoin(DispatchUnit.class,DispatchUnit::getId,DuSolution::getDispatchUnitId)
-                .eq(DispatchUnit::getCompanyId,insuranceApply.getCompanyId())
-                .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
-                .eq(DispatchUnit::getUnitStatus,Constants.ONE)
-                .eq(DuSolution::getIsdeleted,Constants.ZERO)
-                .eq(DuSolution::getStatus,Constants.ONE)
-                .eq(DuSolution::getSolutionId,companySolution.getSolutionId()));
-        if(!CollectionUtils.isNotEmpty(duSolutionList)){
-            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()
-                .eq(DuWorktype::getIsdeleted,Constants.ZERO)
-                .eq(DuWorktype::getStatus,Constants.ONE)
-                .in(DuWorktype::getDuSolutionId,duSolutionIdList));
-        if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+        List<DuSolution>  duSolutionList = new ArrayList<>();
+        List<DuWorktype> duWorktypeList = new ArrayList<>();
+        List<Integer> worktypeIdList = new ArrayList<>();
+        if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+            //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬ｅ崟浣�
+             duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,new MPJLambdaWrapper<DuSolution>()
+                    .selectAll(DuSolution.class)
+                    .innerJoin(DispatchUnit.class,DispatchUnit::getId,DuSolution::getDispatchUnitId)
+                    .eq(DispatchUnit::getCompanyId,insuranceApply.getCompanyId())
+                    .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
+                    .eq(DispatchUnit::getUnitStatus,Constants.ONE)
+                    .eq(DuSolution::getIsdeleted,Constants.ZERO)
+                    .eq(DuSolution::getStatus,Constants.ONE)
+                    .eq(DuSolution::getSolutionId,companySolution.getSolutionId()));
+            if(!CollectionUtils.isNotEmpty(duSolutionList)){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+            }
+            //鏌ヨ鎵�鏈夋淳閬ｅ崟浣嶄笅鐨勫伐绉�
+            List<Integer> duSolutionIdList = duSolutionList.stream().map(i->i.getId()).collect(Collectors.toList());
+             duWorktypeList = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
+                    .eq(DuWorktype::getIsdeleted,Constants.ZERO)
+                    .eq(DuWorktype::getStatus,Constants.ONE)
+                    .in(DuWorktype::getDuSolutionId,duSolutionIdList));
+            if (!CollectionUtils.isNotEmpty(duWorktypeList)) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌宸ョ淇℃伅");
+            }
+            worktypeIdList = duWorktypeList.stream().map(i->i.getWorkTypeId()).collect(Collectors.toList());
+        }else{
+            //鏌ヨ鏂规涓嬫墍鏈夊伐绉嶆暟鎹�
+            List<SolutionWorktype> solutionWorktypeList = solutionWorktypeJoinMapper.selectList(new QueryWrapper<SolutionWorktype>().lambda().eq(SolutionWorktype::getSolutionId,solutions.getId()));
+            if(CollectionUtils.isEmpty(solutionWorktypeList)){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝淇濋櫓鏂规涓嬫湭鏌ヨ鍒板伐绉嶄俊鎭�");
+            }
+            worktypeIdList = solutionWorktypeList.stream().map(i->i.getWorktypeId()).collect(Collectors.toList());
         }
 
         ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO = new ApplyChangeCyclePriceDTO();
@@ -1157,6 +1193,14 @@
         List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
         //鍔犱繚鏁版嵁
         List<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
+        //鎹㈠巶涓氬姟
+        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
+        
+        if(CollectionUtils.isEmpty(delDetailList)
+        && CollectionUtils.isEmpty(addDetailList)
+                && CollectionUtils.isEmpty(changeDetailList)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈坊鍔犱汉鍛樻暟鎹棤娉曡繘琛屾彁浜�");
+        }
 
         if (CollectionUtils.isNotEmpty(addDetailList)) {
             if(Objects.isNull(solutions.getCanAdd()) || solutions.getCanAdd().equals(Constants.ZERO)){
@@ -1175,7 +1219,7 @@
                     ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
                     applyChange.getApplyStartTime(),insuranceApply.getEndTime());
 
-            this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee,delDetailList.size());
+            this.addChangeDetail(applyChange,addDetailList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee,delDetailList.size(),worktypeIdList);
             fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
         }
 
@@ -1192,13 +1236,9 @@
             this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo, BigDecimal.ZERO,
                     DateUtil.getMontageDate(applyChange.getDelValidTime(),3));
             fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add));
-//            fee = fee.add(delDetailList.stream().map(ApplyChagneDetail::getReduceMoney).reduce(BigDecimal.ZERO,BigDecimal::add));
         }
 
-       
-
         //鎹㈠巶涓氬姟
-        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
         if (CollectionUtils.isNotEmpty(changeDetailList)) {
             if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屾崲鍘傛搷浣�");
@@ -1210,8 +1250,10 @@
                 throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
             }
 
-            this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
+            this.changeDetail(applyChange,changeDetailList,duSolutionList,loginUserInfo,solutions,worktypeIdList);
         }
+        Long end = System.currentTimeMillis();
+        logger.error("澶勭悊鍔犲噺淇濅繚鍗曟暟鎹粨鏉熸椂闂�:=========================>"+end +";鍗曟潯鑰楁椂锛�====銆�"+(end-start));
         return fee;
     }
 
@@ -1242,18 +1284,59 @@
      */
     public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,
                                 LoginUserInfo loginUserInfo,BigDecimal detailFee,Date endTime){
+        if(DateUtil.getMontageDate(applyChange.getDelValidTime(),3).getTime()>insuranceApply.getEndTime().getTime()){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚鐢熸晥鏈熶笉鑳芥櫄浜庝繚鍗曠粨鏉熸棩鏈�");
+        }
         for (ApplyChagneDetail applyChagneDetail : delDetailList) {
             if (Objects.isNull(applyChagneDetail.getMemberId())) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
             }
-
-
+            //2024-10-29 15:17:54 鏌ヨ鏄惁宸插嚭闄� 宸插嚭闄╂棤娉曡繘琛屾姇淇�
+            if(settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
+                    .eq(SettleClaims::getInsuranceApplyId,applyChange.getApplyId())
+                    .eq(SettleClaims::getMemberId,applyChagneDetail.getMemberId())
+                    .in(SettleClaims::getStatus,Constants.SettleClaimsStatus.DEAL_ING.getKey()
+                            ,Constants.SettleClaimsStatus.CONFIRM_INFORMATION.getKey()
+                            ,Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey())
+            )>Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑洪櫓鏃犳硶杩涜鍑忎繚");
+            };
+            //2024-10-29 15:17:54 鏌ヨ浜哄憳鏄惁宸插噺淇� 宸插噺淇濆悗鏃犳硶鍐嶆鍑忎繚
+//            if(applyChangeDetailJoinMapper.selectJoinCount(new MPJLambdaWrapper<ApplyChagneDetail>()
+//                    .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+//                    .eq(ApplyChagneDetail::getType,Constants.ONE)
+//                    .eq(ApplyChange::getApplyId,applyChange.getApplyId())
+//                            .eq(ApplyChagneDetail::getMemberId,applyChagneDetail.getMemberId())
+//                    .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.CLOSE.getKey()
+//                            ,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()
+//                    )
+//            )>Constants.ZERO){
+//                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑忎繚鏃犳硶鍐嶆杩涜鍑忎繚");
+//            };
+            //2025-1-16 09:11:14 鏍规嵁鏌ヨ褰撳墠浜哄憳鏈�鍚庝竴娆＄殑鍔犲噺淇濊褰� 濡傛灉鏈�鍚庝竴鏉¤褰曟槸鍔犱繚杩涘叆 鍒欏彲浠ュ噺淇� 濡傛灉鏈�鍚庝竴鏉¤褰曟槸鍑忎繚璁板綍 鍒欎笉鍙互鍑忎繚 濡傛灉涓虹┖ 杩欏彲浠ヨ繘琛屾搷浣�
+            ApplyChagneDetail lastApplyChagneDetail = applyChangeDetailJoinMapper.selectJoinOne(ApplyChagneDetail.class,
+                    new MPJLambdaWrapper<ApplyChagneDetail>()
+                    .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
+                    .ne(ApplyChagneDetail::getType,Constants.TWO)
+                    .eq(ApplyChange::getApplyId,applyChange.getApplyId())
+                    .eq(ApplyChagneDetail::getMemberId,applyChagneDetail.getMemberId())
+                    .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.CLOSE.getKey()
+                            ,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()
+                    )
+                    .orderByDesc(ApplyChagneDetail::getId)
+                    .last(" limit 1 ")
+            );
+            if(Objects.nonNull(lastApplyChagneDetail)){
+                if(Constants.equalsInteger(lastApplyChagneDetail.getType(),Constants.ONE)){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝凡鍑忎繚鏃犳硶鍐嶆杩涜鍑忎繚");
+                }
+            }
             //鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
             if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
                     .lambda()
                     .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
                     .eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
-                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
+//                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
                     .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
             )<=Constants.ZERO){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
@@ -1275,6 +1358,7 @@
             }
             //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
             List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+                            .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                     .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                     .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
 //                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),1))
@@ -1290,7 +1374,6 @@
             if(!Constants.equalsInteger(applyDetail.getChangeStatus(),Constants.ZERO)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯�,鏁版嵁宸茶鍑忎繚鏃犳硶鍐嶆鍑忎繚");
             }
-            applyChagneDetail.setPrice(applyDetail.getPrice());
             applyChagneDetail.setCreateDate(new Date());
             applyChagneDetail.setCreator(loginUserInfo.getId());
             applyChagneDetail.setIsdeleted(Constants.ZERO);
@@ -1298,78 +1381,273 @@
             applyChagneDetail.setType(Constants.ONE);
             applyChagneDetail.setApplyDetailId(applyDetail.getId());
             applyChagneDetail.setStartTime(applyDetail.getStartTime());
-            applyChagneDetail.setEndTime(endTime);
+            if(endTime.getTime()<applyChagneDetail.getStartTime().getTime()){
+                applyChagneDetail.setEndTime(applyChagneDetail.getStartTime());
+                applyChagneDetail.setFee(applyDetail.getFee().multiply(BigDecimal.valueOf(-1)));
+            }else{
+                applyChagneDetail.setEndTime(endTime);
+                applyChagneDetail.setFee(
+                        Constants.reduceFee(solutions,
+                                        Objects.isNull(insuranceApply.getServerCost())?
+                                                solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost()),
+                                        insuranceApply.getStartTime(),
+                                        insuranceApply.getFinalEndTime(),
+                                        applyDetail.getStartTime(),endTime)
+                                .subtract(applyDetail.getFee()
+                                ));
+            }
             applyChagneDetail.setReduceMoney(BigDecimal.ZERO);
-
             member.setApplyId(insuranceApply.getId());
             member.setDuId(applyChagneDetail.getDuId());
             member.setWorktypeId(applyChagneDetail.getWorktypeId());
             member.setStartTime(applyChagneDetail.getStartTime());
             member.setEndTime(applyDetail.getEndTime());
             memberMapper.updateById(member);
-            //鏌ヨ鍑忎繚鏃ユ湡
-//            Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
-//            ;
+            //鍑忎繚閲戦
 
-            //鏌ヨ鍛ㄦ湡鏁伴噺
-            applyChagneDetail.setFee(
-                    Constants.reduceFee(solutions,
-                                    Objects.isNull(insuranceApply.getServerCost())?
-                                    solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost()),
-                                    insuranceApply.getStartTime(),
-                                    insuranceApply.getFinalEndTime(),
-                                    applyDetail.getStartTime(),endTime)
-                            .subtract(applyDetail.getFee()
-            ));
             //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
             if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
              && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
                 applyChagneDetail.setReduceMoney(solutions.getPrice().multiply(new BigDecimal(-1)));
+                applyChagneDetail.setFee(BigDecimal.ZERO);
             }
+            applyChagneDetail.setId(null);
             applyChagneDetailJoinMapper.insert(applyChagneDetail);
         }
     }
 
+    /**
+     * 鍔犱繚鏁版嵁澶勭悊
+     * @param applyChange 鍔犲噺淇濅繚鍗曟暟鎹�
+     * @param addDetailList  鍔犱繚浜哄憳
+     * @param duSolutionList  娲鹃仯鍗曚綅鏂规鏁版嵁
+     * @param loginUserInfo 鎿嶄綔浜�
+     */
+    public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,
+                                List<DuSolution> duSolutionList,
+                                InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee,Integer delSize,
+                                List<Integer> worktypeIdList){
+        if(applyChange.getApplyStartTime().getTime()>insuranceApply.getEndTime().getTime()){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚鐢熸晥鏈熶笉鑳藉ぇ浜庝繚鍗曠粨鏉熸棩鏈�");
+        }
+        //鏌ヨ鏈鍔犱繚鎵�鏈変汉鍛樹俊鎭�
+        List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+                .eq(Member::getIsdeleted,Constants.ZERO)
+                .in(Member::getIdcardNo,addDetailList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList()))
+        );
+        ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+                .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
+                .isNotNull(ApplyDetail::getPrice)
+                .last("limit 1 ")
+        );
+        if(Objects.isNull(applyDetail)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "淇濆崟涓嬫棤鏄庣粏鏁版嵁");
+        }
+        List<Member> updMemberList = new ArrayList<>();
+        //鏌ヨ鏈鍔犱繚鎵�鏈変汉鍛樼殑鍘嗗彶淇濆崟璁板綍
+        List<ApplyDetail> applyDetailAllList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
+                new MPJLambdaWrapper<ApplyDetail>()
+                        .selectAll(ApplyDetail.class)
+                        .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
+                        .selectAs(InsuranceApply::getStatus,ApplyDetail::getApplyStatus)
+                        .selectAs(Company::getName,ApplyDetail::getCompanyName)
+                        .selectAs(Solutions::getBaseId,ApplyDetail::getSolutionBaseId)
+                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                        .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
+                        .in(CollectionUtils.isNotEmpty(memberList),ApplyDetail::getMemberId,memberList.stream().map(i->i.getId()).collect(Collectors.toList()))
+                        .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ")
+                        .eq(ApplyDetail::getIsdeleted,Constants.ZERO));
 
+        List<ApplyChagneDetail> applyChangeDetailAllList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
+                new MPJLambdaWrapper<ApplyChagneDetail>()
+                        .selectAll(ApplyChagneDetail.class)
+                        .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                        .leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId)
+                        .eq(ApplyChange::getApplyId,applyChange.getApplyId())
+                        .in(CollectionUtils.isNotEmpty(memberList),Member::getIdcardNo,memberList.stream().map(i->i.getIdcardNo()).collect(Collectors.toList()))
+                        .apply(CollectionUtils.isEmpty(memberList),"1 = 2 ")
+                        .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE));
+
+        List<ApplyChagneDetail> applyChagneDetailList = new ArrayList<>();
+        for (int i = 0; i < addDetailList.size(); i++) {
+            ApplyChagneDetail applyChagneDetail = addDetailList.get(i);
+            if (
+                    Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getDuId())
+                            || Objects.isNull(applyChagneDetail.getWorktypeId())
+                            || StringUtils.isBlank(applyChagneDetail.getIdcardNo())
+            ) {
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
+            }
+
+            //鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
+            long age = Constants.getAgeByIdCard(applyChagneDetail.getIdcardNo());
+            if(Objects.isNull(age)
+                    || age > solutions.getMaxAge()
+                    || age < solutions.getMinAge()){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+applyChagneDetail.getMemberName()+"銆戝憳宸ュ勾榫勮秴鍑烘柟妗堥厤缃� 鏂规閰嶇疆銆�"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"銆戝瓨鍦ㄥ紓甯告暟鎹紒");
+            }
+
+            //鏌ヨ褰撳墠澶勭悊鐨勪汉鍛樹俊鎭�
+            List<Member> optMembers = memberList.stream().filter(j->j.getIdcardNo().equals(applyChagneDetail.getIdcardNo())).collect(Collectors.toList());
+            Member member = new Member();
+            if(CollectionUtils.isEmpty(optMembers)){
+                member = new Member();
+                member.setCreateDate(new Date());
+                member.setCreator(loginUserInfo.getId());
+                member.setIsdeleted(Constants.ZERO);
+                member.setName(applyChagneDetail.getMemberName());
+                member.setCompanyId(insuranceApply.getCompanyId());
+                member.setSex(Constants.getSexByIdCard(applyChagneDetail.getIdcardNo()));
+                if(!IdcardUtil.isValidCard(applyChagneDetail.getIdcardNo())){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍔犱繚鍛樺伐淇℃伅韬唤璇佷俊鎭敊璇痆"+member.getName()+"]");
+                }
+                member.setIdcardNo(applyChagneDetail.getIdcardNo());
+                member.setApplyId(insuranceApply.getId());
+                member.setDuId(applyChagneDetail.getDuId());
+                member.setWorktypeId(applyChagneDetail.getWorktypeId());
+                memberMapper.insert(member);
+                applyChagneDetail.setMemberId(member.getId());
+            }else{
+                member = optMembers.get(Constants.ZERO);
+                member.setApplyId(insuranceApply.getId());
+                member.setDuId(applyChagneDetail.getDuId());
+                member.setWorktypeId(applyChagneDetail.getWorktypeId());
+                member.setStartTime(applyChagneDetail.getStartTime());
+                member.setEndTime(applyChagneDetail.getEndTime());
+//                memberMapper.updateById(member);
+                updMemberList.add(member);
+                applyChagneDetail.setMemberId(member.getId());
+                if(CollectionUtils.isNotEmpty(applyChangeDetailAllList)&&applyChangeDetailAllList.stream().filter(
+                        j->Constants.equalsInteger(j.getMemberId(),applyChagneDetail.getMemberId())
+                ).collect(Collectors.toList()).size()>Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
+                }
+
+            }
+            List<ApplyDetail> memberApplyDetailList = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(applyDetailAllList)){
+                memberApplyDetailList = applyDetailAllList.stream().filter(j->j.getIdcardNo().equals(applyChagneDetail.getIdcardNo())).collect(Collectors.toList());
+
+                if(memberApplyDetailList.stream().filter(j->j.getIdcardNo().equals(applyChagneDetail.getIdcardNo())&&Constants.equalsInteger(j.getApplyId(),applyChange.getApplyId())
+                        && j.getStartTime().getTime() <= DateUtil.getMontageDate(applyChange.getApplyStartTime(),1).getTime()
+                        && j.getEndTime().getTime() >= DateUtil.getMontageDate(insuranceApply.getEndTime(),2).getTime()
+                ).collect(Collectors.toList()).size()>Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
+                };
+                
+                if(memberApplyDetailList.stream().filter(j->j.getIdcardNo().equals(applyChagneDetail.getIdcardNo())
+                        &&Constants.equalsInteger(j.getApplyId(),applyChange.getApplyId())
+                        && j.getStartTime().getTime() <= System.currentTimeMillis()
+                        && j.getEndTime().getTime() >= System.currentTimeMillis()
+                ).collect(Collectors.toList()).size()>Constants.ZERO){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄤ繚闅滀腑鐨勪繚鍗曚俊鎭紝鏃犳硶杩涜鍔犱繚");
+                };
+
+            } 
+
+            applyChagneDetail.setPrice(applyDetail.getPrice());
+            applyChagneDetail.setCreateDate(new Date());
+            applyChagneDetail.setCreator(loginUserInfo.getId());
+            applyChagneDetail.setIsdeleted(Constants.ZERO);
+            applyChagneDetail.setApplyChangeId(applyChange.getId());
+            applyChagneDetail.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1));
+            applyChagneDetail.setEndTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2));
+            applyChagneDetail.setType(Constants.ZERO);
+
+
+            List<ApplyDetail> checkStaticMemberSolutionList = memberApplyDetailList.stream()
+                            .filter(j->Constants.equalsInteger(j.getSolutionBaseId(),solutions.getBaseId())
+                            && !( j.getApplyStatus() == Constants.InsuranceApplyStatus.CLOSE.getKey() || j.getApplyStatus() == Constants.InsuranceApplyStatus.WTB_CLOSED.getKey() )
+                            && (
+                                ( applyChange.getApplyStartTime().getTime()<= j.getStartTime().getTime() && j.getStartTime().getTime() <  insuranceApply.getEndTime().getTime() )
+                                    ||
+                                ( applyChange.getApplyStartTime().getTime()< j.getEndTime().getTime() && j.getEndTime().getTime() <  insuranceApply.getEndTime().getTime() )
+                                    ||
+                                ( applyChange.getApplyStartTime().getTime()> j.getStartTime().getTime() &&   insuranceApply.getEndTime().getTime() < j.getEndTime().getTime() )
+                                            )
+                            ).collect(Collectors.toList());
+
+            if(checkStaticMemberSolutionList.size() >Constants.ZERO){
+                String companyName = checkStaticMemberSolutionList.get(Constants.ZERO).getCompanyName();
+                String idCode = checkStaticMemberSolutionList.get(Constants.ZERO).getIdcardNo();
+                if(StringUtils.isNotBlank(companyName)){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ュ憳宸ャ��"+applyChagneDetail.getMemberName()+" "+idCode+"銆戝凡鍦ㄣ��"+companyName+"銆戝瓨鍦ㄤ繚闄�,璇疯仈绯诲鏈嶇‘璁�");
+                }else{
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ュ憳宸ャ��"+applyChagneDetail.getMemberName()+" "+idCode+"銆戝湪璇ヤ繚闄╂柟妗堜笅宸插瓨鍦ㄦ姇淇濊褰曪紝鏃犳硶杩涜璇ユ搷浣�");
+                }
+            };
+
+            //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+            if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+                if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+                }
+            }
+            if (worktypeIdList.stream().filter(d ->  Constants.equalsInteger(d,applyChagneDetail.getWorktypeId()))
+                    .collect(Collectors.toList()).size() <= Constants.ZERO) {
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
+            }
+            applyChagneDetail.setMemberId(member.getId());
+            //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
+            if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+                    && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit()) && delSize> i){
+                applyChagneDetail.setFee(BigDecimal.ZERO);
+            }else{
+                applyChagneDetail.setFee(detailFee);
+            }
+            applyChagneDetail.setId(null);
+            applyChagneDetailList.add(applyChagneDetail);
+        }
+        if(CollectionUtils.isNotEmpty(applyChagneDetailList)){
+            applyChagneDetailJoinMapper.insert(applyChagneDetailList);
+        }
+        if(CollectionUtils.isNotEmpty(updMemberList)){
+            Thread t1=new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        memberMapper.insertOrUpdate(updMemberList);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            });
+            t1.start(); 
+        }
+    }
 
     /**
      * 鍔犱繚鏁版嵁澶勭悊
-     * @param applyChange
-     * @param addDetailList
-     * @param duWorktypeList
-     * @param duSolutionList
-     * @param loginUserInfo
+     * @param applyChange 鍔犲噺淇濅繚鍗曟暟鎹�
+     * @param addDetailList  鍔犱繚浜哄憳
+     * @param duSolutionList  娲鹃仯鍗曚綅鏂规鏁版嵁
+     * @param loginUserInfo 鎿嶄綔浜�
      */
-    public void addChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,
-                                List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,
-                                InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee,Integer delSize){
+    public void addChangeDetailOld(ApplyChange applyChange ,List<ApplyChagneDetail> addDetailList,
+                                List<DuSolution> duSolutionList,
+                                InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo,BigDecimal detailFee,Integer delSize,
+                                List<Integer> worktypeIdList){
+        if(applyChange.getApplyStartTime().getTime()>insuranceApply.getEndTime().getTime()){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚鐢熸晥鏈熶笉鑳藉ぇ浜庝繚鍗曠粨鏉熸棩鏈�");
+        }
         for (int i = 0; i < addDetailList.size(); i++) {
             ApplyChagneDetail applyChagneDetail = addDetailList.get(i);
-            if (    Objects.isNull(applyChagneDetail.getDuId())
+            if (
+                    Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getDuId())
                     || Objects.isNull(applyChagneDetail.getWorktypeId())
                     || StringUtils.isBlank(applyChagneDetail.getIdcardNo())
             ) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
             }
-            //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
-            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
-                    applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
-                    applyDetailJoinMapper);
 
             //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
             if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
                     .lambda()
                     .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
                     .eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
-//                    .apply(" ( " +
-//                            " '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"'  <= t.start_time AND t.start_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' " +
-//                            " or " +
-//                            "  ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"' < t.end_time AND t.end_time < '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' )  " +
-//                            " or " +
-//                            " ( '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))+"' > t.start_time AND '"+DateUtil.getLongDateTime(DateUtil.getMontageDate(insuranceApply.getEndTime(),2))+"' < t.end_time )" +
-//                            " ) " )
                     .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
-                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
             )>Constants.ZERO){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
             }
@@ -1377,6 +1655,7 @@
             ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>()
                             .lambda()
                             .eq(ApplyDetail::getApplyId,applyChange.getApplyId()).last("limit 1"));
+
             if(Objects.isNull(applyDetail)){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "淇濆崟涓湭瀛樺湪鏄庣粏璁板綍");
             }
@@ -1412,17 +1691,14 @@
                     member.setApplyId(insuranceApply.getId());
                     member.setDuId(applyChagneDetail.getDuId());
                     member.setWorktypeId(applyChagneDetail.getWorktypeId());
-                    member.setStartTime(applyChagneDetail.getStartTime());
-                    member.setEndTime(applyChagneDetail.getEndTime());
                     memberMapper.insert(member);
                 }else{
                     member.setApplyId(insuranceApply.getId());
                     member.setDuId(applyChagneDetail.getDuId());
                     member.setWorktypeId(applyChagneDetail.getWorktypeId());
-                    member.setStartTime(applyChagneDetail.getStartTime());
-                    member.setEndTime(applyChagneDetail.getEndTime());
                     memberMapper.updateById(member);
                 }
+                applyChagneDetail.setMemberId(member.getId());
             }else{
                 member = memberMapper.selectById(applyChagneDetail.getMemberId());
                 if(Objects.isNull(member)){
@@ -1435,6 +1711,11 @@
                 member.setEndTime(applyChagneDetail.getEndTime());
                 memberMapper.updateById(member);
             }
+
+            //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+                    applyChagneDetail.getMemberId(),applyChagneDetail.getIdcardNo(),applyChagneDetail.getMemberName(),applyChange.getApplyStartTime(),insuranceApply.getEndTime(),
+                    applyDetailJoinMapper);
 
             //鏍规嵁鍛樺伐韬唤璇佽繘琛屽垽鏂勾榫�
             long age = Constants.getAgeByIdCard(member.getIdcardNo());
@@ -1467,11 +1748,14 @@
                     throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄤ繚闅滀腑鐨勪繚鍗曚俊鎭紝鏃犳硶杩涜鍔犱繚");
                 }
             }
+
             //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
-            if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
-                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+            if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+                if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+                }
             }
-            if (duWorktypeList.stream().filter(d ->  d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+            if (worktypeIdList.stream().filter(d ->  Constants.equalsInteger(d,applyChagneDetail.getWorktypeId()))
                     .collect(Collectors.toList()).size() <= Constants.ZERO) {
                 throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
             }
@@ -1491,17 +1775,17 @@
     /**
      * 鎹㈠巶涓氬姟
      * @param applyChange
-     * @param duWorktypeList
      * @param duSolutionList
      * @param changeDetailList
      * @param loginUserInfo
      */
-    public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList,List<DuWorktype> duWorktypeList,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo){
+    public void changeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> changeDetailList
+            ,List<DuSolution> duSolutionList,LoginUserInfo loginUserInfo,Solutions solutions ,List<Integer> worktypeIdList){
         for (ApplyChagneDetail applyChagneDetail : changeDetailList) {
             if (Objects.isNull(applyChagneDetail.getMemberId())
-                    || Objects.isNull(applyChagneDetail.getOldDuId())
+                    || (Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && Objects.isNull(applyChagneDetail.getOldDuId()))
                     || Objects.isNull(applyChagneDetail.getOldWorktypeId())
-                    || Objects.isNull(applyChagneDetail.getDuId())
+                    || (Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) &&  Objects.isNull(applyChagneDetail.getDuId()))
                     || Objects.isNull(applyChagneDetail.getWorktypeId())
             ) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝繀濉」缂哄け");
@@ -1534,6 +1818,7 @@
             }
             //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
             List<ApplyDetail>  applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getIsdeleted,Constants.ZERO)
                     .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
                     .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
                     .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
@@ -1547,15 +1832,18 @@
             if(applyChange.getValidTime().compareTo( applyDetail.getEndTime())>0){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��"+DateUtil.getDate(applyDetail.getEndTime(),"yyyy-MM-dd HH:mm:ss")+"銆戞棤娉曢�氳繃鏈鐢宠");
             }
-            //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
-            if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
-                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+            if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+                //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+                if (duSolutionList.stream().filter(d -> d.getDispatchUnitId().equals(applyChagneDetail.getDuId())).collect(Collectors.toList()).size() <= Constants.ZERO) {
+                    throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ユ淳閬ｅ崟浣嶆湭鏌ヨ鍒帮紒");
+                }
             }
-            if (duWorktypeList.stream().filter(d ->  d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+            if (worktypeIdList.stream().filter(d ->  Constants.equalsInteger(d,applyChagneDetail.getWorktypeId()))
                     .collect(Collectors.toList()).size() <= Constants.ZERO) {
                 throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝憳宸ュ伐绉嶄俊鎭湭鏌ヨ鍒帮紒");
             }
-            if(applyChagneDetail.getOldDuId().equals(applyChagneDetail.getDuId())
+
+            if((Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO) && applyChagneDetail.getOldDuId().equals(applyChagneDetail.getDuId()))
             && applyChagneDetail.getOldWorktypeId().equals(applyChagneDetail.getWorktypeId())){
                 throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞崲鍘傛暟鎹浉鍚岋紒");
             }
@@ -1567,14 +1855,14 @@
             applyChagneDetail.setType(Constants.TWO);
             applyChagneDetail.setStartTime(applyDetail.getStartTime());
             applyChagneDetail.setEndTime(applyDetail.getEndTime());
-
+            applyChagneDetail.setId(null);
             applyChagneDetailJoinMapper.insert(applyChagneDetail);
 
             member.setApplyId(applyChange.getApplyId());
             member.setDuId(applyChagneDetail.getDuId());
             member.setWorktypeId(applyChagneDetail.getWorktypeId());
-            member.setStartTime(applyChagneDetail.getStartTime());
-            member.setEndTime(applyChagneDetail.getEndTime());
+//            member.setStartTime(applyChagneDetail.getStartTime());
+//            member.setEndTime(applyChagneDetail.getEndTime());
             memberMapper.updateById(member);
 
         }
@@ -1630,7 +1918,18 @@
         QueryWrapper<ApplyChange> wrapper = new QueryWrapper<>(applyChange);
         return applyChangeMapper.selectList(wrapper);
     }
-  
+
+    @Override
+    public List<ApplyChange> findListByApplyId(Integer applyId,Integer type) {
+        List<ApplyChange> applyChangeList = applyChangeMapper.selectList(new QueryWrapper<ApplyChange>()
+                .lambda().eq(ApplyChange::getApplyId,applyId)
+                .eq(Objects.nonNull(type),ApplyChange::getType,type)
+                .in(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey())
+        );
+        return applyChangeList;
+    }
+
+
     @Override
     public PageData<ApplyChange> findPage(PageWrap<ApplyChange> pageWrap) {
 
@@ -1650,6 +1949,7 @@
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+                .eq(ApplyChange::getIsdeleted,Constants.ZERO)
                 .eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
                 .in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
                         Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
@@ -1710,6 +2010,7 @@
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+                .eq(ApplyChange::getIsdeleted,Constants.ZERO)
                 .eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
                 .in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
                         Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
@@ -1750,6 +2051,12 @@
         queryWrapper.orderByDesc(ApplyDetail::getCreateDate);
 
         PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
+        for (ApplyChange applyChange:pageData.getRecords()) {
+
+            applyChange.setChangeMoney(Constants.getTwoPoint(applyChange.getChangeMoney()));
+            applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
+        }
+
         return pageData;
     }
 
@@ -1772,6 +2079,7 @@
                         ApplyChange::getStatus,
                         Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
                         Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                .eq(ApplyChange::getIsdeleted,Constants.ZERO)
                 .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
                 .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
                 .like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
@@ -1802,6 +2110,9 @@
                 }*/
 
                 List<ApplyChange> list =applyChangeJoinMapper.selectJoinList(ApplyChange.class,queryWrapper);
+                for (ApplyChange applyChange:list) {
+                    applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
+                }
                 List<ApplyChange> result = new ArrayList<>();
                 for (int i = 1; i <= 12; i++) {
                     if(i<10){
@@ -1838,6 +2149,7 @@
                 .selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
                 .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
                 .selectAs(Solutions::getType,ApplyChange::getSolutionType)
+                .selectAs(Solutions::getHasDispatchUnit,ApplyChange::getHasDispatchUnit)
                 .selectAs(Company::getName,ApplyChange::getCompanyName)
                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 0  )",ApplyChange::getAddNum)
                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 1  )",ApplyChange::getDelNum)
@@ -1847,6 +2159,7 @@
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
+                .eq(ApplyChange::getIsdeleted,Constants.ZERO)
                 .eq(!Objects.isNull(model.getStatus())&&!model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,model.getStatus())
                 .in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),
                         ApplyChange::getStatus,
@@ -1912,17 +2225,13 @@
             String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
                     +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
             for(ApplyChange model : list){
-                for(Multifile f : multifiles) {
-                    if (StringUtils.isBlank(f.getFileurl())) {
-                        continue;
+                List<Multifile> multifileList = multifiles.stream().filter(m->Constants.equalsInteger(m.getObjId(), model.getId())&& 
+                        Constants.equalsInteger(m.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())).collect(Collectors.toList());
+                if(CollectionUtils.isNotEmpty(multifileList)){
+                    for (Multifile multifile:multifileList) {
+                        multifile.setFileurlFull(path + multifile.getFileurl());
                     }
-                    f.setFileurlFull(path+f.getFileurl());
-                    if(Constants.equalsInteger(f.getObjId(), model.getId()) ){
-                        if (Constants.equalsInteger(f.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())) {
-                            //绛剧讲鍓嶇殑鎶曚繚鍗�
-                            model.setPidanFile(f);
-                        }
-                    }
+                    model.setPidanFileList(multifileList);
                 }
             }
         }
@@ -2086,6 +2395,8 @@
         );
         applyChange.setApplyLogList(applyLogList);
 
+
+        applyChange.setFee(Constants.getTwoPoint(applyChange.getFee()));
         List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                 .eq(Multifile::getObjId, applyChange.getId() )
 //                .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey()
@@ -2106,10 +2417,19 @@
                 }else    if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey())){
                     //绛剧讲鍚庣敵璇峰崟
                     applyChange.setApplyUnitFile(f);
-                }else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_PD_PDF.getKey())){
-                    //绛剧讲鍚庣殑鎶曚繚鍗�
-                    applyChange.setPidanFile(f);
                 }
+//                else if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_PD_PDF.getKey())){
+//                    //绛剧讲鍚庣殑鎶曚繚鍗�
+//                    applyChange.setPidanFile(f);
+//                }
+            }
+            List<Multifile> multifileList = multifiles.stream().filter(m->Constants.equalsInteger(m.getObjId(), applyChange.getId())&&
+                    Constants.equalsInteger(m.getObjType(), Constants.MultiFile.CA_PD_PDF.getKey())).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(multifileList)){
+                for (Multifile multifile:multifileList) {
+                    multifile.setFileurlFull(path + multifile.getFileurl());
+                }
+                applyChange.setPidanFileList(multifileList);
             }
         }
 
@@ -2162,17 +2482,27 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
         }
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        Company company = user.getCompany();
+
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+        if(Objects.isNull(insuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
+        }
+        Company company = companyMapper.selectById(insuranceApply.getCompanyId());
+        if(Objects.isNull(company)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟淇℃伅");
+        }
+        String companyName = company.getName();
+        String creditCode = company.getCode();
+        String email = company.getEmail();
+
+
         /*if(debugModel){
             company = companyMapper.selectById(model.getCompanyId());
         }*/
         if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
             throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠＄悊鍛樼‘璁");
         }
-        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
-        if(Objects.isNull(insuranceApply)){
-            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇繚鍗曚俊鎭�");
-        }
+
         Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
         if(Objects.isNull(solutions)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
@@ -2185,7 +2515,11 @@
         }
         String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
         notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
-        String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚浼佷笟绛剧珷",company.getSignId(),notifyUrl);
+        String applyNo = signService.applySignLocalFileByParam(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鎶曚繚浼佷笟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
+        //涓存椂浣跨敤
+//        fileUrl =
+//                "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241120/1c80f0d7-ab35-4355-b9fe-944464643115.pdf";
+//        String applyNo = signService.applySign(companyName,fileUrl,companyName,creditCode,email,"浜哄憳鍚嶅崟绛剧珷",null,notifyUrl);
         if(StringUtils.isBlank(applyNo) ){
             throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
         }
@@ -2325,10 +2659,15 @@
 //        }
         BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
         CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
-        returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
-                sumPrice
-                ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
-                DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays()),insuranceApply.getEndTime()));
+        Date addStartTime = DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays());
+        if(addStartTime.getTime()<insuranceApply.getStartTime().getTime()){
+            returnCountCyclePriceVO.setCyclePrice(solutions.getPrice());
+        }else{
+            returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
+                    sumPrice
+                    ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),addStartTime
+                    ,insuranceApply.getEndTime()));
+        }
         BigDecimal reducePrice =  solutions.getPrice().subtract(Constants.reduceFee(solutions,
                         sumPrice
                         ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime()
@@ -2405,10 +2744,6 @@
         ){
             throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        //楠岃瘉 楠岃瘉鐮�
-//        if(!debugModel){
-//            smsEmailService.validateCode(smsCheckDTO.getCode());
-//        }
         ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
         if(Objects.isNull(model)){
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠姞鍑忎繚/鎹㈠巶淇℃伅");
@@ -2438,7 +2773,12 @@
             }
             String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
             notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
-            String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"浜哄憳鍚嶅崟绛剧珷",company.getSignId(),notifyUrl);
+
+            //涓存椂浣跨敤
+//            fileUrl =  "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";
+//            String applyNo = signService.applySignDoByParam(company.getName(),fileUrl,company.getName(),company.getCode(),company.getEmail(),"浜哄憳鍚嶅崟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
+
+            String applyNo = signService.applySignLocalFileByParam(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"浜哄憳鍚嶅崟绛剧珷",company.getSignId(),notifyUrl,new Float(0.7));
             if(StringUtils.isBlank(applyNo) ){
                 throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
             }
@@ -2469,9 +2809,9 @@
 
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
-    public Integer check(ApplyChange applyChange) {
+    public Integer check(ApplyChange applyChange,UnionChangeServiceImpl unionChangeService) {
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-        if(!user.getType().equals(Constants.TWO)){
+        if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
         }
         if(applyChange.getId() == null){
@@ -2534,10 +2874,38 @@
         if(Constants.equalsInteger(model.getType(),Constants.ONE)){
             noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
         }
-        //鍒犻櫎鍏ㄩ儴寰呭姙
+         //鍒犻櫎鍏ㄩ儴寰呭姙
         noticesMapper.delete(new QueryWrapper<Notices>().lambda()
                 .eq(Notices::getObjType, noticeObjectType.getKey())
                 .eq(Notices::getObjId, model.getId()));
+        if(Constants.equalsInteger(applyChange.getDealBackApply(),Constants.ZERO)){
+            InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+            if(Objects.isNull(insuranceApply)||Objects.isNull(insuranceApply.getUnionApplyId())){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
+            }
+            SaveUnionChangeDTO saveUnionChangeDTO = new SaveUnionChangeDTO();
+            saveUnionChangeDTO.setApplyDate(model.getValidTime());
+            List<Integer> applyIds = new ArrayList<>();
+            applyIds.add(model.getId());
+            saveUnionChangeDTO.setApplyIds(applyIds);
+            saveUnionChangeDTO.setApplyChange(model);
+            saveUnionChangeDTO.setUnionApplyId(insuranceApply.getUnionApplyId());
+            saveUnionChangeDTO.setBusinessType(model.getType());
+            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+                saveUnionChangeDTO.setShopId(user.getCompanyId());
+            }else{
+                CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>()
+                        .lambda().eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
+                        .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()).last(" limit 1 "));
+                if(Objects.isNull(companySolution)){
+                    throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鏂规淇℃伅");
+                }
+                saveUnionChangeDTO.setShopId(companySolution.getShopId());
+
+            }
+
+            unionChangeService.merge(saveUnionChangeDTO);
+        }
         return  1;
 
     }

--
Gitblit v1.9.3