From cdd6551b190b981b807a3b95e9635c559ccc769d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 19 五月 2025 09:45:07 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 2330 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 2,034 insertions(+), 296 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 9264c44..9959130 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
@@ -1,6 +1,12 @@
 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.annotation.excel.Reflections;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
 import com.doumee.core.model.LoginUserInfo;
@@ -10,26 +16,35 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
-import com.doumee.dao.business.dto.ApplyChangeOptDTO;
-import com.doumee.dao.business.dto.InsuranceApplyOptDTO;
-import com.doumee.dao.business.join.ApplyChagneDetailJoinMapper;
-import com.doumee.dao.business.join.ApplyChangeJoinMapper;
-import com.doumee.dao.business.join.ApplyDetailJoinMapper;
+import com.doumee.dao.business.dto.*;
+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;
@@ -48,6 +63,8 @@
     private ApplyChangeMapper applyChangeMapper;
 
     @Autowired
+    private DuSolutionJoinMapper duSolutionJoinMapper;
+    @Autowired
     private InsuranceApplyMapper insuranceApplyMapper;
 
     @Autowired
@@ -57,14 +74,31 @@
     private ApplyChangeJoinMapper applyChangeJoinMapper;
 
     @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+    @Autowired
+    private CompanyMapper companyMapper;
+    @Autowired
+    private SignService signService;
+    @Autowired
     private ApplyChagneDetailJoinMapper applyChagneDetailJoinMapper;
 
     @Autowired
     private ApplyDetailJoinMapper applyDetailJoinMapper;
 
     @Autowired
+    private SettleClaimsMapper settleClaimsMapper;
+
+    @Autowired
+    private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
+
+    @Autowired
+    private ApplyChangeDetailJoinMapper applyChangeDetailJoinMapper;
+
+    @Autowired
     private MemberMapper memberMapper;
 
+    @Autowired
+    private SolutionWorktypeJoinMapper solutionWorktypeJoinMapper;
     @Autowired
     private MultifileMapper multifileMapper;
     @Autowired
@@ -74,12 +108,20 @@
 
     @Autowired
     private ApplyLogMapper applyLogMapper;
+    @Value("${debug_model}")
+    private boolean debugModel;
+    @Autowired
+    private ApplyLogJoinMapper applyLogJoinMapper;
 
     @Autowired
     private SolutionsMapper solutionsMapper;
 
+    @Autowired
+    private SmsEmailService smsEmailService;
+    @Autowired
+    private NoticesMapper noticesMapper;
     /**
-     * 骞冲彴閫�鍥炴姇淇�
+     * 骞冲彴閫�鍥炵敵璇�
      * @param param
      * @return
      */
@@ -94,26 +136,59 @@
         if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
         }
-        if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
-                ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
-            //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
-            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+        if(Objects.isNull(insuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+        }
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+        }
+
+        if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+            if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.APPROVE.getKey())){
+                //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+        }else if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+            if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.UPLOAD.getKey())
+            || Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey()) ){
+                //宸叉彁浜ゅ拰宸插畬鎴愮姸鎬佷笉鏀寔瀹℃牳涓嶉�氳繃
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
         }
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         ApplyChange update = new ApplyChange();
         update.setEditDate(new Date());
         update.setEditor(user.getId());
-        update.setStatus(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey());
+        update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
         update.setCheckDate(update.getEditDate());
         update.setCheckInfo(param.getCheckInfo());
         update.setCheckUserId(user.getId());
         update.setId(model.getId());
         applyChangeMapper.updateById(update);
 
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        if(model.getType().equals(Constants.ONE)){
+            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+        }
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+                insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
+//        notices.setParam1(insuranceApply.getId().toString());
+        noticesMapper.insert(notices);
+
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
         String info =applyLogType.getInfo();
         info = info.replace("${param}", update.getCheckInfo());
-        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(),
+                info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
         return  1;
 
@@ -125,19 +200,45 @@
         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);
         }
 
         ApplyChange model = applyChangeMapper.selectById(param.getId());
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+        if(Objects.isNull(insuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟淇℃伅");
+        }
+        if(model.getType().equals(Constants.ZERO)){
+            if(param.getDelValidTime() == null){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+            }
+            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())){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰噺鏃ユ湡蹇呴』澶勪簬淇濆崟鐢宠鏃ユ湡鍐�");
+            }
+        }else{
+            if(param.getApplyStartTime().getTime()<model.getApplyStartTime().getTime()){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏃ユ湡蹇呴』澶т簬鐢宠鏃ユ湡");
+            }
+        }
         if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(model.getType(),Constants.ONE)&&
+                 param.getDelValidTime() == null ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
             throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
         }
+
 
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         ApplyChange update = new ApplyChange();
@@ -146,28 +247,48 @@
         update.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
         update.setCheckDate(update.getEditDate());
         update.setCheckInfo(param.getCheckInfo());
+        update.setApplyId(model.getApplyId());
         update.setCheckUserId(user.getId());
         update.setId(model.getId());
         update.setValidCode(param.getValidCode());
-        update.setApplyStartTime(model.getApplyStartTime());
-        applyChangeMapper.updateById(update);
-
-        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());
-
+        update.setApplyStartTime(param.getApplyStartTime());
+        update.setDelValidTime(param.getDelValidTime());
+        update.setCode(model.getCode());
+        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.insertBatchSomeColumn(pidanFileList);
         update.setApplyId(model.getApplyId());
+
+
         if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
             //濡傛灉鏄姞鍑忎繚鐢宠 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
-            dealDetailsValidTime(update);
+            dealDetailsValidTime(update,insuranceApply);
         }else{
             //濡傛灉鏄崲鍘傜敵璇� 澶勭悊鏄庣粏鏁版嵁
-            dealDetailsDUdata(update);
+            dealDetailsDUdata(update,insuranceApply);
         }
+
+        applyChangeMapper.updateById(update);
+
+
+
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        if(model.getType().equals(Constants.ONE)){
+            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+        }
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
 
 
         Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_APPROVE;
@@ -180,7 +301,8 @@
         ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
 
-        return  1;
+
+        return  model.getApplyId();
 
     }
     @Override
@@ -188,10 +310,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);
         }
 
@@ -213,6 +337,15 @@
         update.setId(model.getId());
         update.setValidCode(param.getValidCode());
         applyChangeMapper.updateById(update);
+
+        //淇敼鍛樺伐淇濆崟璁板綍
+        memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>()
+                .lambda()
+                .set(MemberInsurance::getPdCode,param.getValidCode())
+                .eq(MemberInsurance::getRelationType,Constants.ONE)
+                .eq(MemberInsurance::getApplyChangeId,model.getId())
+        );
+
         //鍒犻櫎鍘熸湁鐨勪繚鍗曚俊鎭�
         multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
                 .set(Multifile::getIsdeleted,Constants.ZERO)
@@ -220,155 +353,483 @@
                 .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.insertBatchSomeColumn(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();
         info = info.replace("${param}",param.getCheckInfo());
         ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
-
         return  1;
 
     }
 
     /**
-     * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+     * 澶勭悊鎹㈠巶鏄庣粏鏁版嵁
      * @param update
      */
-    private void dealDetailsDUdata(ApplyChange update ) {
+    private void dealDetailsDUdata(ApplyChange update,InsuranceApply insuranceApply) {
         List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
                 new MPJLambdaWrapper<ApplyChagneDetail>()
                         .selectAll(ApplyChagneDetail.class)
                         .selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
                         .selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
-                  .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
-                  .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
+                        .selectAs(Solutions::getId,ApplyChagneDetail::getSolutionId)
+                        .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
+                        .selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
+                        .selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
+                        .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                        .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
+                        .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
+                        .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
+                        .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                      .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+                      .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
+                    .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
+                    .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
                   .eq(ApplyChagneDetail::getApplyChangeId,update.getId())
                   .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
+
         if(detailList ==null || detailList.size()==0){
             return;
         }
+        //瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
+        Date applyStartTime = DateUtil.getMontageDate(update.getApplyStartTime(),1);
         for(ApplyChagneDetail detail : detailList){
+            if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+                    .lambda()
+                    .eq(ApplyDetail::getApplyId,update.getApplyId())
+                    .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
+                    .le(ApplyDetail::getStartTime,applyStartTime)
+                    .ge(ApplyDetail::getEndTime,applyStartTime)
+            )<=Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鎹㈠巶浜哄憳銆�" + detail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+            }
+
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
+                    .eq(ApplyDetail::getApplyId, update.getApplyId())
+                    .eq(ApplyDetail::getMemberId, detail.getMemberId())
+                    .le(ApplyDetail::getStartTime,applyStartTime)
+                    .ge(ApplyDetail::getEndTime,applyStartTime)
+                    .orderByDesc(ApplyDetail::getCreateDate)
+                    .last("limit 1"));
+            if(oldModel == null  ){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屾壒鍗曟棩鏈熸湭鍦ㄤ繚鍗曟棩鏈熷唴锛�");
+            }
+
+            MemberInsurance memberInsurance = new MemberInsurance(detail,update,update.getEditor(),null,insuranceApply.getSolutionId());
+            memberInsurance.setSolutionId(detail.getSolutionId());
+            memberInsurance.setWorktypeName(detail.getWorkTypeName());
+            memberInsurance.setDuName(detail.getDuName());
+            memberInsurance.setApplyChangeId(detail.getApplyChangeId());
+            memberInsurance.setSolutionName(detail.getSolutionsName());
+            memberInsurance.setPdCode(update.getValidCode());
+            memberInsurance.setBdCode(insuranceApply.getCode());
+            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()
+                    .set(ApplyDetail::getEditor,update.getEditor())
+                    .set(ApplyDetail::getEditDate,update.getEditDate())
+                    .set(ApplyDetail::getDuId,detail.getDuId())
+                    .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+                    .eq(ApplyDetail::getId,oldModel.getId())
+            );
+            memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+                    .eq(MemberInsurance::getApplyId,update.getApplyId())
+                    .le(MemberInsurance::getStartTime,applyStartTime)
+                    .ge(MemberInsurance::getEndTime,applyStartTime)
+                    .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())!=0,
+                            MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 3))
+                    .set(insuranceApply.getStartTime().compareTo(update.getApplyStartTime())==0,
+                            MemberInsurance::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(), 2))
+                            .ne(MemberInsurance::getId,memberInsurance.getId())
+//                    .eq(MemberInsurance::getRelationId,oldModel.getId())
+            );
+
+            //濡傛灉瀹為檯鎵瑰崟鏃ユ湡 鍜� 鍘熻褰曟棩鏈熺浉绛� 鍒欑洿鎺ヤ慨鏀硅褰曟淳閬e崟浣嶄笌宸ョ淇℃伅
+//            if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
+//                //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
+//                Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(update.getApplyStartTime(),2))>0;
+//                //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
+//                Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(update.getApplyStartTime(),3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
+//                BigDecimal oldFee = this.getApplyPrice(update.getApplyId(),days);
+//                BigDecimal fee = oldModel.getFee();
+//                BigDecimal oldCurrentFee = oldModel.getCurrentFee();
+//
+//                applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+//                        .set(ApplyDetail::getEditor,update.getEditor())
+//                        .set(ApplyDetail::getEditDate,update.getEditDate())
+//                        .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(update.getApplyStartTime(),3))
+//                        .set(ApplyDetail::getFee,oldFee)
+//                        .set(flag,ApplyDetail::getCurrentFee,oldFee)
+//                        .eq(ApplyDetail::getId,oldModel.getId())
+//                );
+//
+//                //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+//                memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+//                        .set(MemberInsurance::getEndTime,update.getApplyStartTime())
+//                        .set(MemberInsurance::getFee,oldFee)
+//                        .eq(MemberInsurance::getRelationId,oldModel.getId())
+//                );
+//
+//                ApplyDetail applyDetail = new ApplyDetail();
+//                applyDetail.setApplyId(oldModel.getApplyId());
+//                applyDetail.setCreateDate(new Date());
+//                applyDetail.setCreator(update.getEditor());
+//                applyDetail.setMemberId(oldModel.getMemberId());
+//                applyDetail.setIdcardNo(detail.getIdcardNo());
+//                applyDetail.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
+//                applyDetail.setMemberName(detail.getMemberName());
+//                applyDetail.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(),1));
+//                applyDetail.setEndTime(endDate);
+//                applyDetail.setDuId(detail.getDuId());
+//                applyDetail.setWorktypeId(detail.getWorktypeId());
+//                applyDetail.setIdcardNo(oldModel.getIdcardNo());
+//                applyDetail.setFee(fee.subtract(oldFee));
+//                applyDetail.setIsdeleted(Constants.ZERO);
+//                if(flag){
+//                    applyDetail.setCurrentFee(oldCurrentFee.multiply(oldFee));
+//                }else{
+//                    applyDetail.setCurrentFee(BigDecimal.ZERO);
+//                }
+//                applyDetail.setSex(oldModel.getSex());
+//                applyDetail.setMemberName(oldModel.getMemberName());
+//                applyDetail.setFromId(detail.getId());
+//                applyDetailJoinMapper.insert(applyDetail);
+//
+//                MemberInsurance memberInsurance = new MemberInsurance(applyDetail,update.getId());
+//                memberInsurance.setSolutionId(detail.getSolutionId());
+//                memberInsurance.setWorktypeName(detail.getWorkTypeName());
+//                memberInsurance.setDuName(detail.getDuName());
+//                memberInsurance.setApplyChangeId(detail.getApplyChangeId());
+//                memberInsurance.setSolutionName(detail.getSolutionsName());
+//                memberInsurance.setPdCode(update.getValidCode());
+//                memberInsurance.setBdCode(insuranceApply.getCode());
+//                memberInsurance.setRelationType(Constants.ONE);
+//                memberInsuranceJoinMapper.insert(memberInsurance);
+//            }else{
+//                applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+//                        .set(ApplyDetail::getEditor,update.getEditor())
+//                        .set(ApplyDetail::getEditDate,update.getEditDate())
+//                        .set(ApplyDetail::getDuId,detail.getDuId())
+//                        .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+//                        .eq(ApplyDetail::getId,oldModel.getId())
+//                );
+//                //鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
+//                memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+//                        .set(MemberInsurance::getDuId,detail.getDuId())
+//                        .set(MemberInsurance::getDuName,detail.getDuName())
+//                        .set(MemberInsurance::getWorktypeId,detail.getWorktypeId())
+//                        .set(MemberInsurance::getWorktypeName,detail.getWorkTypeName())
+//                        .eq(MemberInsurance::getRelationId,oldModel.getId())
+//                );
+//            }
+
+            Member member = memberMapper.selectById(detail.getMemberId());
+            if(Objects.isNull(member)){
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+            }
+            member.setApplyId(update.getApplyId());
+            member.setDuId(detail.getDuId());
+            member.setWorktypeId(detail.getWorktypeId());
+//            member.setStartTime(detail.getStartTime());
+//            member.setEndTime(detail.getEndTime());
+            memberMapper.updateById(member);
+
+            applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+                    .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(), 1))
+                    .eq(ApplyChagneDetail::getId,detail.getId())
+            );
+        }
+    }
+    /**
+     * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+     * @param update
+     */
+    private void dealDetailsValidTime(ApplyChange update,InsuranceApply insuranceApply) {
+        List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
+                new MPJLambdaWrapper<ApplyChagneDetail>()
+                        .selectAll(ApplyChagneDetail.class)
+                        .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                        .selectAs(Solutions::getTimeUnit, ApplyChagneDetail::getSolutionTimeUnit)
+                        .selectAs(Solutions::getPrice, ApplyChagneDetail::getSolutionPrice)
+                        .selectAs(Worktype::getName, ApplyChagneDetail::getWorkTypeName)
+                        .selectAs(DispatchUnit::getName, ApplyChagneDetail::getDuName)
+                        .selectAs(Member::getName, ApplyChagneDetail::getMemberName)
+                        .selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
+                        .selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
+                        .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                        .leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
+                        .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
+                        .leftJoin(Solutions.class, Solutions::getId, InsuranceApply::getSolutionId)
+                        .leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
+                        .leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
+                        .eq(ApplyChagneDetail::getApplyChangeId, update.getId())
+                        .eq(ApplyChagneDetail::getIsdeleted, Constants.ZERO));
+        if (detailList == null || detailList.size() == 0) {
+            return;
+        }
+        BigDecimal totalFee = new BigDecimal(0);
+        BigDecimal currentFee = new BigDecimal(0);
+        //鎶曚繚璁板綍 鍔犱繚鏁版嵁鍔犲叆鏂版暟鎹�  鍑忎繚鏁版嵁 淇敼鑰佹暟鎹�
+        List<MemberInsurance> memberInsuranceList = new ArrayList<>();
+
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.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());
+        //鍑忎繚涓氬姟
+        for (ApplyChagneDetail detail:reduceList) {
+            Member member = memberMapper.selectById(detail.getMemberId());
+            if(Objects.isNull(member)){
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+            }
+            //鍑忎繚鎿嶄綔
             //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
             ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
                     .eq(ApplyDetail::getApplyId, update.getApplyId())
                     .eq(ApplyDetail::getMemberId, detail.getMemberId())
                     .orderByDesc(ApplyDetail::getCreateDate)
                     .last("limit 1"));
-            if(oldModel == null  ){
-                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+//            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() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
             }
-            applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
-                    .set(ApplyDetail::getEditor,update.getEditor())
-                    .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
-                    .set(ApplyDetail::getDuId,detail.getDuId())
-                    .set(ApplyDetail::getEditDate,update.getEditDate())
-                    .eq(ApplyDetail::getId,oldModel.getApplyId())
+            BigDecimal sumFee = Objects.isNull(insuranceApply.getServerCost())?
+                    solutions.getPrice():
+                    solutions.getPrice().add(insuranceApply.getServerCost());
+            // 鍑忎繚鍚� 鎬昏垂鐢� 榛樿涓哄噺淇濆悗涓� 0
+            BigDecimal updateFee = BigDecimal.ZERO;
+            // 鍑忎繚鍚� 鎵瑰崟鏃ユ湡  榛樿涓� 鎵瑰崟鍑忎繚鏃ユ湡  00:00:00
+            Date delValidTime = update.getDelValidTime();
+            //褰撳鎵规椂闂� 澶т簬 鐢宠鐨勬椂闂存椂 璁$畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
+            BigDecimal updateCurrentFee = BigDecimal.ZERO;
+            //濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
+            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());
+            BigDecimal reduceMoney = BigDecimal.ZERO;
+
+            if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+                    && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
+                if(delValidTime.getTime()<=oldModel.getStartTime().getTime()){
+                    updateFee  = BigDecimal.ZERO;
+                    updateWrapper.lambda().set(ApplyDetail::getFee,updateFee)
+                            .set(ApplyDetail::getChangeStatus,Constants.TWO);
+                }else{
+                    reduceMoney = solutions.getPrice().multiply(new BigDecimal(-1));
+                    //鏍囪鏁版嵁宸茶鏇挎崲
+                    updateWrapper.lambda().set(ApplyDetail::getReduceMoney,reduceMoney)
+                            .set(ApplyDetail::getChangeStatus,Constants.ONE);
+                }
+                detail.setApplyDetailId(oldModel.getId());
+            }
+
+
+            applyDetailJoinMapper.update(null, updateWrapper);
+            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())
+//            );
+
+            //淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
+            applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+                    .set(ApplyChagneDetail::getFee,updateFee.subtract(oldModel.getFee()))
+                    .set( ApplyChagneDetail::getEndTime, delValidTime)
+                    .eq(ApplyChagneDetail::getId,detail.getId())
             );
 
+            member.setApplyId(update.getApplyId());
+            member.setDuId(detail.getDuId());
+            member.setWorktypeId(detail.getWorktypeId());
+            member.setStartTime(detail.getStartTime());
+            member.setEndTime(detail.getEndTime());
+            memberMapper.updateById(member);
         }
-    }
-    /**
-     * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
-     * @param update
-     */
-    private void dealDetailsValidTime(ApplyChange update ) {
-        List<ApplyChagneDetail> detailList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
-                new MPJLambdaWrapper<ApplyChagneDetail>()
-                        .selectAll(ApplyChagneDetail.class)
-                        .selectAs(Solutions::getTimeUnit,ApplyChagneDetail::getSolutionTimeUnit)
-                        .selectAs(Solutions::getPrice,ApplyChagneDetail::getSolutionPrice)
-                  .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
-                  .leftJoin(Solutions.class, Solutions::getId, ApplyChange::getSolutionsId)
-                  .eq(ApplyChagneDetail::getApplyChangeId,update.getId())
-                  .eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO) );
-        if(detailList ==null || detailList.size()==0){
-            return;
-        }
-        List<ApplyDetail> addList = new ArrayList<>();
-        List<Integer> reduceMembers = new ArrayList<>();
-        BigDecimal totalFee = new BigDecimal(0);
-        BigDecimal currentFee = new BigDecimal(0);
 
-        for(ApplyChagneDetail detail : detailList){
-            if(Constants.equalsInteger(detail.getType(),Constants.ZERO)){
-                //鍔犱繚
-                ApplyDetail add = new ApplyDetail();
-                add.setApplyId(update.getApplyId());
-                add.setValidCode(update.getValidCode());
-                add.setFee(detail.getFee());
-                add.setIsdeleted(Constants.ZERO);
-                add.setCreator(update.getEditor());
-                add.setCreateDate(update.getEditDate());
-                add.setMemberId(detail.getMemberId());
-                add.setMemberName(detail.getMemberName());
-                add.setWorktypeId(detail.getWorktypeId());
-                add.setDuId(detail.getDuId());
-                add.setStartTime(update.getApplyStartTime());
-                add.setEndTime(detail.getEndTime());
-                add.setFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),add.getEndTime()));
-                if(DateUtil.daysBetweenDates(add.getStartTime(),new Date() )>=0){
-                    //濡傛灉宸蹭骇鐢熻垂鐢紝璁$畻宸蹭骇鐢熻垂鐢�
-                    add.setCurrentFee(Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), add.getStartTime(),new Date()));
-                }
-                addList.add(add);
-                totalFee.add(add.getFee());
-                currentFee.add(add.getCurrentFee());
-            }else{
-                //鍑忎繚鎿嶄綔
-                //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
-                ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
-                        .eq(ApplyDetail::getApplyId, update.getApplyId())
-                        .eq(ApplyDetail::getMemberId, detail.getMemberId())
-                        .orderByDesc(ApplyDetail::getCreateDate)
-                        .last("limit 1"));
-                if(oldModel == null || oldModel.getStartTime()==null || oldModel.getStartTime().getTime() > update.getApplyStartTime().getTime()){
-                    throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
-                }
-                BigDecimal updateFee = (Constants.countDetailFee(detail.getSolutionTimeUnit(),detail.getSolutionPrice(), oldModel.getStartTime(),update.getApplyStartTime()));
-                BigDecimal updateCurrentFee = new BigDecimal(0);
-                if(DateUtil.daysBetweenDates(update.getApplyStartTime(),new Date() )>0){
-                    //濡傛灉鐢熸晥鏃堕棿 鏄粖澶╀箣鍓嶏紝閫�鍥炲凡浜х敓璐圭敤锛岃绠楀凡浜х敓璐圭敤(鎬昏垂鐢�-宸蹭骇鐢熻垂鐢�)
-                    updateCurrentFee = updateFee.subtract(oldModel.getCurrentFee());
-                }
-                applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
-                        .setSql(" fee = ifnull(fee,0)+"+updateFee)
-                        .setSql(" current_fee = "+updateFee)
-                        .set(ApplyDetail::getEditor,update.getEditor())
-                        .set(ApplyDetail::getEditDate,update.getEditDate())
-                        .eq(ApplyDetail::getId,oldModel.getApplyId())
-                );
-                totalFee.add(updateFee);
-                currentFee.add(updateCurrentFee);
-
+        //鍔犱繚涓氬姟
+        for (int i = 0; i < addList.size(); i++) {
+            ApplyChagneDetail detail  = addList.get(i);
+            Member member = memberMapper.selectById(detail.getMemberId());
+            if (Objects.isNull(member)) {
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌鍛樺伐鏁版嵁");
             }
+            //鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
+            InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
+                    member.getId(),member.getIdcardNo(),member.getName(),detail.getStartTime(),detail.getEndTime(),
+                    applyDetailJoinMapper);
+
+            //鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
+            if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+                    .lambda()
+                    .eq(ApplyDetail::getApplyId,update.getApplyId())
+                    .eq(ApplyDetail::getIdcardNo,detail.getIdcardNo())
+                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(),1))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(detail.getEndTime(),2))
+            )>Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
+            }
+            //鍔犱繚
+            ApplyDetail add = new ApplyDetail();
+            add.setApplyId(update.getApplyId());
+            add.setValidCode(update.getValidCode());
+            add.setFee(detail.getFee());
+            add.setIsdeleted(Constants.ZERO);
+            add.setCreator(update.getEditor());
+            add.setCreateDate(update.getEditDate());
+            add.setMemberId(detail.getMemberId());
+            add.setMemberName(detail.getMemberName());
+            add.setWorktypeId(detail.getWorktypeId());
+            add.setIsdeleted(Constants.ZERO);
+            add.setIdcardNo(detail.getIdcardNo());
+            add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
+            add.setMemberName(detail.getMemberName());
+            add.setRemark(detail.getRemark());
+            add.setDuId(detail.getDuId());
+            add.setStartTime(DateUtil.getMontageDate(update.getApplyStartTime(), 1));
+            add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
+            add.setFee(Constants.addFee(solutions,solutions.getPrice(),insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),update.getApplyStartTime(),insuranceApply.getEndTime()));
+            add.setChangeStatus(Constants.ZERO);
+
+            if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+                    && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit()) && i < reduceList.size()){
+                add.setReduceId(reduceList.get(i).getId());
+            }
+            if(new Date().compareTo(DateUtil.getMontageDate(detail.getStartTime(), 2))>=0){
+                //2024骞�5鏈�8鏃�17:37:23 淇敼 璁$畻浜х敓璐圭敤
+                add.setCurrentFee(
+                        Constants.produceFee(solutions,add.getFee(),add.getStartTime(),add.getEndTime(),add.getStartTime())
+                );
+            }else{
+                add.setCurrentFee(BigDecimal.ZERO);
+            }
+            applyDetailJoinMapper.insert(add);
+            //濡傛灉涓嶆槸鏇挎崲涓氬姟鐨勫姞淇濇暟鎹� 鍒欐坊鍔犲疄闄呬骇鐢熻垂鐢�
+            detail.setFee(Objects.isNull(add.getReduceId())?add.getFee():BigDecimal.ZERO);
+            totalFee = totalFee.add(add.getFee());
+            if(Objects.isNull(add.getReduceId())){
+                currentFee = currentFee.add(add.getCurrentFee());
+            }
+            MemberInsurance memberInsurance = new MemberInsurance(detail, update, update.getEditor(), add.getId(),solutions.getId());
+            memberInsurance.setStartTime(add.getStartTime());
+            memberInsurance.setEndTime(add.getEndTime());
+            memberInsurance.setRelationType(Constants.ONE);
+            memberInsuranceList.add(memberInsurance);
+
+            applyChangeDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
+                    .set(ApplyChagneDetail::getFee,add.getFee())
+                    .set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(update.getApplyStartTime(), 1))
+                    .eq(ApplyChagneDetail::getId,detail.getId())
+            );
+
+            member.setApplyId(update.getApplyId());
+            member.setDuId(detail.getDuId());
+            member.setWorktypeId(detail.getWorktypeId());
+            member.setStartTime(detail.getStartTime());
+            member.setEndTime(detail.getEndTime());
+            memberMapper.updateById(member);
         }
-        if(addList!=null && addList.size()>0){
-            applyDetailJoinMapper.insertBatchSomeColumn(addList);
+
+        if (memberInsuranceList != null && memberInsuranceList.size() > 0) {
+            memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
         }
-        if(totalFee.compareTo(new BigDecimal(0)) != 0){
+
+        if (totalFee.compareTo(new BigDecimal(0)) != 0) {
             //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
             insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
-                    .setSql(" fee = ifnull(fee,0)+"+totalFee)
-                    .setSql(" current_fee = ifnull(current_fee,0)+"+currentFee)
-                    .set(InsuranceApply::getEditor,update.getEditor())
-                    .set(InsuranceApply::getEditDate,update.getEditDate())
-                    .eq(InsuranceApply::getId,update.getApplyId())
+                    .setSql(" fee = ifnull(fee,0)+" + totalFee)
+                    .setSql(" current_fee = ifnull(current_fee,0)+" + currentFee)
+                    .set(InsuranceApply::getEditor, update.getEditor())
+                    .set(InsuranceApply::getEditDate, update.getEditDate())
+                    .eq(InsuranceApply::getId, update.getApplyId())
             );
-
         }
-
+        update.setFee(totalFee);
     }
 
     /**
-     * 骞冲彴閫�鍥炴姇淇�
+     * 骞冲彴閫�鍥炵敵璇�
      * @param param
      * @return
      */
@@ -384,32 +845,50 @@
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
         }
 
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(model.getApplyId());
+        if(Objects.isNull(insuranceApply)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(insuranceApply.getIsdeleted().equals(Constants.ONE)){
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
+        }
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+        }
+
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         Constants.ApplyLogType applyLogType = null;
         String info = "";
         ApplyChange update = new ApplyChange();
+        Constants.NoticeType noticeType = Constants.NoticeType.FOUR;
         if(param.getDealBackApply() ==1){
             //濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
-            if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+            if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                    ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))
+            ){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+            if(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+                update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+            }else {
+                update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
             }
             applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
             info = applyLogType.getInfo();
             info = info.replace("${param}", param.getCheckInfo());
-            update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
+
+            noticeType = Constants.NoticeType.FIVE;
         }else{
             //濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
             if(!(Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
                     ||Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()))){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
             }
-            applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
-            if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
-                update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
-            }else if( Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
-                update.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
-            }
+            update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
+            applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
         }
+
         update.setEditDate(new Date());
         update.setEditor(user.getId());
         //鍚屾剰閫�鍥烇紝鐩存帴鍥炲埌鏈�鍒濈姸鎬侊紝濡傛灉椹冲洖閫�鍥炵敵璇凤紝鍒欎繚鍗曠姸鎬佸洖鍒板緟涓婁紶淇濋櫓鍗�
@@ -418,6 +897,18 @@
         update.setCheckUserId(user.getId());
         update.setId(model.getId());
         applyChangeMapper.updateById(update);
+
+
+        //瀛樺偍寰呭姙淇℃伅
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        if(model.getType().equals(Constants.ONE)){
+            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+        }
+        //鍒犻櫎鍏朵粬寰呭姙
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));
+        Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+                insuranceApply.getCompanyId(), noticeType);
+        noticesMapper.insert(notices);
 
         ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
         applyLogMapper.insert(log);
@@ -429,27 +920,34 @@
     @Override
     @Transactional(rollbackFor = {Exception.class,BusinessException.class})
     public Integer create(ApplyChange applyChange) {
+        if(applyChange.getType().equals(Constants.ZERO)){
+            //2024骞�5鏈�9鏃�14:59:24  淇敼 榛樿鍏ュ綋鍓嶅ぉ
+            applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
+        }
+
         if (Objects.isNull(applyChange)
                 || Objects.isNull(applyChange.getApplyId())
                 || Objects.isNull(applyChange.getValidTime())
                 || Objects.isNull(applyChange.getType())
-                || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.TWO))
+                || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.ONE))
         ) {
             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)) {
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
-        if (insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())) {
+        if (!(Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+                ||Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())
+            )) {
             throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "淇濆崟鐘舵�侀敊璇�");
         }
-        if (DateUtil.compareDate(new Date(), insuranceApply.getEndTime()) >= Constants.ZERO
-        ) {
+        if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝鏃犳硶杩涜璇ユ搷浣�");
         }
         Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
@@ -457,8 +955,115 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
         }
         CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+                .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
+                .eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
+                .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+                .last(" limit 1 ")
+        );
+        if(Objects.isNull(companySolution)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.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(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
+        };
+
+        applyChange.setCreateDate(new Date());
+        applyChange.setCreator(loginUserInfo.getId());
+        applyChange.setEditor(loginUserInfo.getId());
+        applyChange.setEditDate(new Date());
+        applyChange.setIsdeleted(Constants.ZERO);
+        //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
+        if(applyChange.getType().equals(Constants.ZERO)){
+            initJJBValidTime(applyChange,insuranceApply,solutions);
+        }else{
+            applyChange.setApplyStartTime(applyChange.getValidTime());
+        }
+        applyChange.setStatus(Constants.ZERO);
+        applyChangeMapper.insert(applyChange);
+
+        BigDecimal fee  = this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,BigDecimal.ZERO);
+
+        ApplyChange applyChangeFee = new ApplyChange();
+        applyChangeFee.setId(applyChange.getId());
+        applyChangeFee.setFee(fee);
+        applyChangeMapper.updateById(applyChangeFee);
+
+        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.DATA_EMPTY );
+//        }
+        return applyChange.getId();
+    }
+
+
+
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer update(ApplyChange applyChange) {
+        if(applyChange.getType().equals(Constants.ZERO)){
+            //2024骞�5鏈�9鏃�14:59:24  淇敼 榛樿鍏ュ綋鍓嶅ぉ
+            applyChange.setValidTime(DateUtil.getMontageDate(new Date(),1));
+        }
+        if (Objects.isNull(applyChange)
+                || Objects.isNull(applyChange.getId())
+                || Objects.isNull(applyChange.getApplyId())
+//                || Objects.isNull(applyChange.getValidTime())
+                || Objects.isNull(applyChange.getType())
+                || !(applyChange.getType().equals(Constants.ZERO) || applyChange.getType().equals(Constants.ONE))
+        ){
+            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(), "鐢ㄦ埛绫诲瀷閿欒锛氶潪浼佷笟鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+//        }*/
+        ApplyChange dbApplyChange = applyChangeMapper.selectById(applyChange.getId());
+        if(Objects.isNull(dbApplyChange)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(! (dbApplyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
+        || dbApplyChange.getStatus().equals(Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS_NO.getKey()) )
+        ){
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "涓氬姟淇濈敵璇峰崟鐘舵�侀敊璇�");
+        }
+
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
+        if (Objects.isNull(insuranceApply)) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if (!(Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+        ||Constants.equalsInteger(insuranceApply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
+        )) {
+            throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(), "淇濆崟鐘舵�侀敊璇�");
+        }
+        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::getSolutionBaseId,solutions.getId())
+                .eq(CompanySolution::getSolutionBaseId,solutions.getBaseId())
                 .eq(CompanySolution::getIsdeleted,Constants.ZERO)
                 .last(" limit 1 ")
         );
@@ -466,74 +1071,212 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌浼佷笟鍒嗛厤淇濋櫓鏂规淇℃伅");
         }
         //鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
-        if (!(DateUtil.compareDate(applyChange.getValidTime(), insuranceApply.getStartTime()) >= Constants.ZERO
-                && DateUtil.compareDate(insuranceApply.getEndTime(), applyChange.getValidTime()) >= Constants.ZERO)) {
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.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())
+                .ne(ApplyChange::getId,applyChange.getId())
+                .notIn(ApplyChange::getStatus,Constants.ApplyChangeStatus.APPROVE.getKey(),Constants.ApplyChangeStatus.CLOSE.getKey())
+        )>Constants.ZERO){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
+        };
+
+        if(applyChange.getType().equals(Constants.ZERO)){
+            //澶勭悊鏈熸湜鐢熸晥鏃ユ湡
+            initJJBValidTime(applyChange,insuranceApply,solutions);
+        }else{
+            applyChange.setApplyStartTime(applyChange.getValidTime());
         }
-        applyChange.setCreateDate(new Date());
-        applyChange.setCreator(loginUserInfo.getId());
-        applyChange.setIsdeleted(Constants.ZERO);
+
+        applyChange.setEditDate(new Date());
+        applyChange.setEditor(loginUserInfo.getId());
         applyChange.setStatus(Constants.ZERO);
-        applyChangeMapper.insert(applyChange);
+        //鍒犻櫎鍘嗗彶鏁版嵁
+        applyChagneDetailJoinMapper.delete(new QueryWrapper<ApplyChagneDetail>().lambda().eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
 
+        BigDecimal fee = this.dealApplyChangeData(applyChange,insuranceApply,companySolution,solutions,loginUserInfo,BigDecimal.ZERO);
+        applyChange.setFee(fee);
+        applyChangeMapper.updateById(applyChange);
 
-        List<DuSolution> duSolutionList = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
-                .eq(DuSolution::getIsdeleted, Constants.ZERO)
-                .eq(DuSolution::getStatus, Constants.ONE)
-                .eq(DuSolution::getSolutionId, insuranceApply.getSolutionId()));
-        if (!CollectionUtils.isNotEmpty(duSolutionList)) {
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_UPLOAD_AGAIN;
+        String info =applyLogType.getInfo();
+        info = info.replace("${param}", "");
+        ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
+        applyLogMapper.insert(log);
+
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        if(applyChange.getType().equals(Constants.ONE)){
+            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
         }
-
-        //鏌ヨ鎵�鏈夋淳閬e崟浣嶄笅鐨勫伐绉�
-        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<ApplyChagneDetail> addDetailList = applyChange.getAddDetailList();
-        if (CollectionUtils.isNotEmpty(addDetailList)) {
-           if(companySolution.getCanAdd().equals(Constants.ZERO)){
-               throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
-           }
-            this.addChangeDetail(applyChange,addDetailList,duWorktypeList,duSolutionList,insuranceApply,solutions,loginUserInfo);
-        }
-
-        //鍑忎繚鏁版嵁
-        List<ApplyChagneDetail> delDetailList = applyChange.getDelDetailList();
-        if (CollectionUtils.isNotEmpty(delDetailList)) {
-            if(companySolution.getCanReduce().equals(Constants.ZERO)){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
-            }
-            this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo);
-        }
-        //鎹㈠巶涓氬姟
-        List<ApplyChagneDetail> changeDetailList = applyChange.getChangeDetailList();
-        if (CollectionUtils.isNotEmpty(changeDetailList)) {
-            this.changeDetail(applyChange,changeDetailList,duWorktypeList,duSolutionList,loginUserInfo);
-        }
-
-        this.saveApplyLog(applyChange,Constants.ApplyChangeLogStatus.UPLOAD,null);
-
+        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
 
         return applyChange.getId();
     }
 
+    private void initJJBValidTime(ApplyChange applyChange, InsuranceApply insuranceApply, Solutions solutions) {
+        if( applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()
+                && Objects.nonNull(solutions.getAddValidDays())){
+            //濡傛灉淇濆崟宸茬敓鏁堬紝鎸夌収t+n鐨勮鍒�
+            applyChange.setApplyStartTime(
+                    DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getAddValidDays())
+            );
+        }else{
+            //濡傛灉淇濆崟鏈敓鎴栬�呮病鏈夐厤缃敓鏁堝ぉ鏁帮紝璁剧疆鏈熸湜鐢熸晥鏃ユ湡涓轰繚鍗曠敓鏁堝紑濮嬫椂闂�
+            applyChange.setApplyStartTime(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()?applyChange.getValidTime():insuranceApply.getStartTime());
+        }
+        if(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()
+                &&Objects.nonNull(solutions.getDelValidDays())){
+            applyChange.setDelValidTime(
+                    DateUtil.afterDateByType(applyChange.getValidTime(),0,solutions.getDelValidDays())
+            );
+        }else{
+            applyChange.setDelValidTime(applyChange.getValidTime().getTime()>=insuranceApply.getStartTime().getTime()?applyChange.getValidTime():insuranceApply.getStartTime());
+        }
+        //浠呮敮鎸佹浛鎹�  淇濊瘉鍔犲噺淇濇棩鏈熶负鍚屼竴澶�
+        if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)){
+            applyChange.setApplyStartTime(
+                    applyChange.getDelValidTime()
+            );
+        }
+    }
 
-    public void saveApplyLog(ApplyChange applyChange,Constants.ApplyChangeLogStatus applyChangeLogStatus,String content){
+    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()){
+                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堜粎鏀寔鏇挎崲锛堝噺淇濅汉鏁颁笉寰楀ぇ浜庡姞淇濅汉鏁帮級");
+                }
+            }
+        }
+        List<DuSolution>  duSolutionList = new ArrayList<>();
+        List<DuWorktype> duWorktypeList = new ArrayList<>();
+        List<Integer> worktypeIdList = new ArrayList<>();
+        if(Constants.equalsInteger(solutions.getHasDispatchUnit(),Constants.ZERO)){
+            //鏌ヨ淇濋櫓鏂规涓嬬殑鎵�鏈夋淳閬e崟浣�
+             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(),"鏁版嵁寮傚父锛氫繚闄╂柟妗堜笅鏈煡璇㈠埌娲鹃仯鍗曚綅");
+            }
+            //鏌ヨ鎵�鏈夋淳閬e崟浣嶄笅鐨勫伐绉�
+            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();
+        applyChangeCyclePriceDTO.setApplyId(insuranceApply.getId());
+
+
+        //鍑忎繚鏁版嵁
+        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)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屽姞淇�");
+            }
+            //楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
+            List<String> idcarNo = addDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
+            Set<String> set = new HashSet<>(idcarNo);
+            if(idcarNo.size() != set.size()){
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
+            }
+
+            BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
+            BigDecimal detailFee = Constants.addFee(solutions,
+                    sumPrice
+                    ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
+                    applyChange.getApplyStartTime(),insuranceApply.getEndTime());
+
+            this.addChangeDetail(applyChange,addDetailList,duSolutionList,insuranceApply,solutions,loginUserInfo,detailFee,delDetailList.size(),worktypeIdList);
+            fee = addDetailList.stream().map(ApplyChagneDetail::getFee).reduce(BigDecimal.ZERO,BigDecimal::add);
+        }
+
+        if (CollectionUtils.isNotEmpty(delDetailList)) {
+            //楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
+            List<String> idcarNo = delDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
+            Set<String> set = new HashSet<>(idcarNo);
+            if(idcarNo.size() != set.size()){
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
+            }
+            if(Objects.isNull(solutions.getCanReduce()) || solutions.getCanReduce().equals(Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
+            }
+            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));
+        }
+
+        //鎹㈠巶涓氬姟
+        if (CollectionUtils.isNotEmpty(changeDetailList)) {
+            if(Objects.isNull(solutions.getCanChangeUnit()) || solutions.getCanChangeUnit().equals(Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ繚闄╂柟妗堟棤娉曡繘琛屾崲鍘傛搷浣�");
+            }
+            //楠岃瘉鏄惁瀛樺湪閲嶅鏁版嵁
+            List<String> idcarNo = changeDetailList.stream().map(m->m.getIdcardNo()).collect(Collectors.toList());
+            Set<String> set = new HashSet<>(idcarNo);
+            if(idcarNo.size() != set.size()){
+                throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝浜哄憳褰曞叆鏁版嵁瀛樺湪鐩稿悓鏁版嵁锛�");
+            }
+
+            this.changeDetail(applyChange,changeDetailList,duSolutionList,loginUserInfo,solutions,worktypeIdList);
+        }
+        Long end = System.currentTimeMillis();
+        logger.error("澶勭悊鍔犲噺淇濅繚鍗曟暟鎹粨鏉熸椂闂�:=========================>"+end +";鍗曟潯鑰楁椂锛�====銆�"+(end-start));
+        return fee;
+    }
+
+
+    public void saveApplyLog(ApplyChange applyChange,Constants.ApplyLogType applyLogType,String content){
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         ApplyLog applyLog = new ApplyLog();
         applyLog.setCreateDate(new Date());
         applyLog.setCreator(loginUserInfo.getId());
         applyLog.setIsdeleted(Constants.ZERO);
         applyLog.setApplyId(applyChange.getApplyId());
-        applyLog.setTitle(applyChangeLogStatus.getName());
-        applyLog.setContent(content);
-        applyLog.setObjType(applyChangeLogStatus.getKey());
+        applyLog.setTitle(applyLogType.getName());
+        if(StringUtils.isNotBlank(content)){
+            applyLog.setContent(applyLogType.getInfo().replace("${param}",content));
+        }
+        applyLog.setObjType(applyLogType.getKey());
         applyLog.setObjId( applyChange.getId());
         applyLog.setStatus(applyChange.getStatus());
         applyLogMapper.insert(applyLog);
@@ -546,11 +1289,66 @@
      * @param delDetailList
      * @param loginUserInfo
      */
-    public void delChangeDetail(ApplyChange applyChange ,List<ApplyChagneDetail> delDetailList,InsuranceApply insuranceApply,Solutions solutions,LoginUserInfo loginUserInfo){
+    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))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
+            )<=Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+            }
+            
             Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
             if (Objects.isNull(member)) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
@@ -559,6 +1357,7 @@
             if (applyChagneDetailJoinMapper.selectJoinCount(
                     new MPJLambdaWrapper<ApplyChagneDetail>()
                             .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
+                            .eq(ApplyChange::getApplyId,applyChange.getApplyId())
                             .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
                             .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
             ) > Constants.ZERO) {
@@ -566,25 +1365,60 @@
             }
             //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
             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))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getDelValidTime(),3))
                     .orderByDesc(ApplyDetail::getCreateDate));
             if (applyDetailList.size() > Constants.ONE) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
             }
             ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
-            if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) <= 0) {
+            if (applyChange.getValidTime().compareTo(applyDetail.getEndTime()) > 0) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
+            }
+            if(!Constants.equalsInteger(applyDetail.getChangeStatus(),Constants.ZERO)){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯�,鏁版嵁宸茶鍑忎繚鏃犳硶鍐嶆鍑忎繚");
             }
             applyChagneDetail.setCreateDate(new Date());
             applyChagneDetail.setCreator(loginUserInfo.getId());
             applyChagneDetail.setIsdeleted(Constants.ZERO);
             applyChagneDetail.setApplyChangeId(applyChange.getId());
             applyChagneDetail.setType(Constants.ONE);
-            applyChagneDetail.setFee(
-                    Constants.countDetailFee(solutions, applyDetail.getEndTime(),applyDetail.getStartTime())
-                            .subtract(Constants.countDetailFee(solutions,applyChange.getValidTime(), applyDetail.getStartTime()))
-            );
+            applyChagneDetail.setApplyDetailId(applyDetail.getId());
+            applyChagneDetail.setStartTime(applyDetail.getStartTime());
+            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);
+            //鍑忎繚閲戦
+
+            //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
+            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);
         }
     }
@@ -593,60 +1427,152 @@
 
     /**
      * 鍔犱繚鏁版嵁澶勭悊
-     * @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){
-        for (ApplyChagneDetail applyChagneDetail : addDetailList) {
-            if (Objects.isNull(applyChagneDetail.getMemberId())
-                    || Objects.isNull(applyChagneDetail.getDuId())
+    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(), "鍔犱繚鐢熸晥鏈熶笉鑳藉ぇ浜庝繚鍗曠粨鏉熸棩鏈�");
+        }
+        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() + "銆戝繀濉」缂哄け");
             }
-            Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
-            if (Objects.isNull(member)) {
-                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.getApplyStartTime(),1))
+                            .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(insuranceApply.getEndTime(),2))
+            )>Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
             }
+
+            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(), "淇濆崟涓湭瀛樺湪鏄庣粏璁板綍");
+            }
+            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);
+            Member member = new Member();
+            if(Objects.isNull(applyChagneDetail.getMemberId())){
+                //鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
+                member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+                        .eq(Member::getCompanyId,insuranceApply.getCompanyId())
+                        .eq(Member::getIsdeleted,Constants.ZERO)
+                        .eq(Member::getIdcardNo,applyChagneDetail.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(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);
+                }else{
+                    member.setApplyId(insuranceApply.getId());
+                    member.setDuId(applyChagneDetail.getDuId());
+                    member.setWorktypeId(applyChagneDetail.getWorktypeId());
+                    memberMapper.updateById(member);
+                }
+                applyChagneDetail.setMemberId(member.getId());
+            }else{
+                member = memberMapper.selectById(applyChagneDetail.getMemberId());
+                if(Objects.isNull(member)){
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
+                }
+                member.setApplyId(insuranceApply.getId());
+                member.setDuId(applyChagneDetail.getDuId());
+                member.setWorktypeId(applyChagneDetail.getWorktypeId());
+                member.setStartTime(applyChagneDetail.getStartTime());
+                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());
+            if(Objects.isNull(age)
+                    || age > solutions.getMaxAge()
+                    || age < solutions.getMinAge()){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+applyChagneDetail.getMemberName()+"銆戝憳宸ュ勾榫勮秴鍑烘柟妗堥厤缃� 鏂规閰嶇疆銆�"+solutions.getMinAge()+" - "+solutions.getMaxAge()+"銆戝瓨鍦ㄥ紓甯告暟鎹紒");
+            }
+
             //鏌ヨ鍛樺伐鏄惁瀛樺湪  0寰呯缃� 1宸茬绔� 鐨勬绫讳笟鍔′繚鏁版嵁 鍚屼竴涓诲崟涓�
             if (applyChagneDetailJoinMapper.selectJoinCount(
                     new MPJLambdaWrapper<ApplyChagneDetail>()
                             .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
                             .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+                            .eq(ApplyChange::getApplyId,applyChange.getApplyId())
                             .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
             ) > Constants.ZERO) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
             }
-            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
-            if (applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda()
-                    .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
-                    .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
-                    .le(ApplyDetail::getStartTime, "now()")
-                    .ge(ApplyDetail::getEndTime, "now()")
-            ) > Constants.ZERO) {
-                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() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+
+            //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
+            if(!Objects.isNull(applyChagneDetail.getMemberId())){
+                if (applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>().lambda()
+                        .eq(ApplyDetail::getApplyId, applyChange.getApplyId())
+                        .eq(ApplyDetail::getMemberId, applyChagneDetail.getMemberId())
+                        .le(ApplyDetail::getStartTime, "now()")
+                        .ge(ApplyDetail::getEndTime, "now()")
+                ) > Constants.ZERO) {
+                    throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍔犱繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄤ繚闅滀腑鐨勪繚鍗曚俊鎭紝鏃犳硶杩涜鍔犱繚");
+                }
             }
-            if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && d.getWorkTypeId().equals(applyChagneDetail.getWorktypeId()))
+            //楠岃瘉娲鹃仯鍗曚綅淇℃伅 涓庡伐绉嶄俊鎭� 鏄惁瀛樺湪
+            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() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+                }
+            }
+            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.setCreateDate(new Date());
-            applyChagneDetail.setCreator(loginUserInfo.getId());
-            applyChagneDetail.setIsdeleted(Constants.ZERO);
-            applyChagneDetail.setApplyChangeId(applyChange.getId());
-            applyChagneDetail.setType(Constants.ZERO);
-            applyChagneDetail.setFee(
-
-                    Constants.countDetailFee(solutions,insuranceApply.getEndTime(),applyChange.getValidTime())
-            );
+            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);
+            }
             applyChagneDetailJoinMapper.insert(applyChagneDetail);
         }
     }
@@ -655,21 +1581,33 @@
     /**
      * 鎹㈠巶涓氬姟
      * @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() + "銆戝繀濉」缂哄け");
             }
+
+            //鏌ヨ鎹㈠巶浜哄憳鏄惁瀛樺湪  鏈夋晥鐨勪繚鍗曟槑缁嗘暟鎹�
+            if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
+                    .lambda()
+                    .eq(ApplyDetail::getApplyId,applyChange.getApplyId())
+                    .eq(ApplyDetail::getIdcardNo,applyChagneDetail.getIdcardNo())
+                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
+            )<=Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮鍚堟壒鍗曟棩鏈熺殑鏁版嵁");
+            }
+
             Member member = memberMapper.selectById(applyChagneDetail.getMemberId());
             if (Objects.isNull(member)) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒扮郴缁熶汉鍛樹俊鎭�");
@@ -679,37 +1617,60 @@
                     new MPJLambdaWrapper<ApplyChagneDetail>()
                             .leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
                             .eq(ApplyChagneDetail::getMemberId, applyChagneDetail.getMemberId())
+                            .eq(ApplyChange::getApplyId, applyChange.getApplyId())
                             .in(ApplyChange::getStatus, Constants.ZERO, Constants.ONE)
             ) > Constants.ZERO) {
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戝瓨鍦ㄧ敵璇蜂腑鐨勫姞鍑忎繚/鎹㈠巶鍗曟嵁");
             }
             //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
             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, "now()")
-                    .ge(ApplyDetail::getEndTime, "now()"));
+                    .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1))
+                    .ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),1)));
             if(applyDetailList.size()>Constants.ONE){
                 throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚俊鎭紓甯革紝瀛樺湪澶氭潯鏁版嵁");
+            }else if(applyDetailList.size()==Constants.ZERO){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戞湭鏌ヨ鍒版姇淇濊褰�");
             }
             ApplyDetail applyDetail = applyDetailList.get(Constants.ZERO);
-            if(applyChange.getValidTime().compareTo( applyDetail.getEndTime())<=0){
-                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鎹㈠巶浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��"+applyDetail.getEndTime()+"銆戞棤娉曢�氳繃鏈鐢宠");
+            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() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+            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() + "銆戝憳宸ユ淳閬e崟浣嶆湭鏌ヨ鍒帮紒");
+                }
             }
-            if (duWorktypeList.stream().filter(d -> d.getDuSolutionId().equals(applyChagneDetail.getDuId()) && 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((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() + "銆戞崲鍘傛暟鎹浉鍚岋紒");
+            }
+            applyChagneDetail.setPrice(applyDetail.getPrice());
             applyChagneDetail.setCreateDate(new Date());
             applyChagneDetail.setCreator(loginUserInfo.getId());
             applyChagneDetail.setIsdeleted(Constants.ZERO);
             applyChagneDetail.setApplyChangeId(applyChange.getId());
             applyChagneDetail.setType(Constants.TWO);
+            applyChagneDetail.setStartTime(applyDetail.getStartTime());
+            applyChagneDetail.setEndTime(applyDetail.getEndTime());
+
             applyChagneDetailJoinMapper.insert(applyChagneDetail);
+
+            member.setApplyId(applyChange.getApplyId());
+            member.setDuId(applyChagneDetail.getDuId());
+            member.setWorktypeId(applyChagneDetail.getWorktypeId());
+//            member.setStartTime(applyChagneDetail.getStartTime());
+//            member.setEndTime(applyChagneDetail.getEndTime());
+            memberMapper.updateById(member);
+
         }
     }
 
@@ -763,9 +1724,22 @@
         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) {
+
+        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         IPage<ApplyChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
@@ -773,6 +1747,7 @@
         queryWrapper
                 .selectAll(ApplyChange.class)
                 .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs( Solutions::getType,InsuranceApply::getSolutionType)
                 .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)
                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
@@ -780,11 +1755,27 @@
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
-                .eq(!Objects.isNull(model.getStatus()),ApplyChange::getStatus,model.getStatus())
+                .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(),
+                        Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
                 .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
                 .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
                 .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
                 .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
+       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=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+            }else if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==1){
+                queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
+            }else{
+                queryWrapper.apply("((t1.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+                        "t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+            }
+        }
 
         for(PageWrap.SortData sortData: pageWrap.getSorts()) {
             if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -814,28 +1805,243 @@
         queryWrapper
                 .selectAll(ApplyChange.class)
                 .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
+                .selectAs(Solutions::getType,ApplyChange::getSolutionType)
+                .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)
+                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
+                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
+                .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                .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(),
+                        Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                .eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
+                .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
+                .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
+                .eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
+                .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
+                .like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
+                .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
+                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" )
+                .ge(StringUtils.isNotBlank(model.getApplyStartS()),ApplyChange::getApplyStartTime, model.getApplyStartS()+" 00:00:00" )
+                .le(StringUtils.isNotBlank(model.getApplyStartE()),ApplyChange::getApplyStartTime, model.getApplyStartE()+" 23:59:59" );
+        LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+        if(loginUserInfo.getType().equals(Constants.ONE)){
+            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else if(loginUserInfo.getType().equals(Constants.TWO)){
+            //濡傛灉鏄晢鎴锋煡鐪�
+            if(pageWrap.getModel().getSolutionType()!=null && pageWrap.getModel().getSolutionType() ==0){
+                queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_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("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 AND cs.SOLUTION_ID = t1.SOLUTION_ID  and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+                        "t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+            }
+        }else{
+            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+            }else{
+                queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+            }
+            queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+        }
+
+        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;
+    }
+
+    @Override
+    public  List<ApplyChange> monthTotalList(ApplyChange model){
+        if(model.getApplyId() ==null || model.getYear() == null){
+            return  new ArrayList<>();
+        }
+        MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .select("count(t.id)",ApplyChange::getCountNum)
+                .select("sum(t.fee)",ApplyChange::getFee)
+                .select("DATE_FORMAT(t.create_date, '%Y-%m')",ApplyChange::getMonth)
+                .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::getApplyId,model.getApplyId())
+                .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(),
+                        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())
+                .ge( ApplyChange::getCreateDate, model.getYear()+"-01-01 00:00:00" )
+                .lt(ApplyChange::getCreateDate, (model.getYear()+1)+"-01-01 00:00:00")
+                .groupBy("month"  );
+           /*     LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+                //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+                if(loginUserInfo.getType().equals(Constants.ONE)){
+                    queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+                }else if(loginUserInfo.getType().equals(Constants.TWO)){
+                    //濡傛灉鏄晢鎴锋煡鐪�
+                    if(model.getSolutionType()!=null && model.getSolutionType() ==0){
+                        queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+                    }else if(model.getSolutionType()!=null && model.getSolutionType() ==1){
+                        queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
+                    }else{
+                        queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+                                "t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+                    }
+                }else{
+                    if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+                        queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+                    }else{
+                        queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+                    }
+                    queryWrapper.eq(model.getCompanyId()!=null,InsuranceApply::getCompanyId, model.getCompanyId());
+                }*/
+
+                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){
+                        result.add(getMonthDayFromList(model.getYear() +"-0"+i,list));
+                    }else{
+                        result.add(getMonthDayFromList(model.getYear() +"-"+i,list));
+                    }
+                }
+                return result;
+
+    }
+
+    private ApplyChange getMonthDayFromList(String s, List<ApplyChange> list) {
+        for(ApplyChange d : list){
+            if(StringUtils.equals(s,d.getMonth())){
+                return d;
+            }
+        }
+        ApplyChange d =  new ApplyChange();
+        d.setMonth(s);
+        d.setFee(new BigDecimal(0));
+        d.setCountNum(0);
+        return d;
+    }
+
+    @Override
+    public List<ApplyChange> findListForCompany(ApplyChange model) {
+        MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper
+                .selectAll(ApplyChange.class)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
+                .selectAs(InsuranceApply::getCode,ApplyChange::getValidCode)
+                .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)
                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
                 .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
+                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(!Objects.isNull(model.getType()),ApplyChange::getType,model.getType())
-                .eq(!Objects.isNull(model.getStatus()),ApplyChange::getStatus,model.getStatus())
-                .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
-                .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+                .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(),
+                        Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
+                .eq(!Objects.isNull(model.getUnionApplyId()),InsuranceApply::getUnionApplyId,model.getUnionApplyId())
+//                .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
+                .eq(!Objects.isNull(model.getSolutionType()),Solutions::getType,model.getSolutionType())
+                .eq(!Objects.isNull(model.getApplyId()),ApplyChange::getApplyId,model.getApplyId())
+                .eq(!Objects.isNull(model.getUnionChangeId()),ApplyChange::getUnionChangeId,model.getUnionChangeId())
+                .eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
+                .like(StringUtils.isNotBlank(model.getSolutionsName()),Solutions::getName,model.getSolutionsName())
                 .ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
-                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
+                .le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" )
+                .ge(StringUtils.isNotBlank(model.getApplyStartS()),ApplyChange::getApplyStartTime, model.getApplyStartS()+" 00:00:00" )
+                .le(StringUtils.isNotBlank(model.getApplyStartE()),ApplyChange::getApplyStartTime, model.getApplyStartE()+" 23:59:59" );
+        LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+        if(loginUserInfo.getType().equals(Constants.ONE)){
+            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+        }else if(loginUserInfo.getType().equals(Constants.TWO)){
+            //濡傛灉鏄晢鎴锋煡鐪�
+            if(model.getSolutionType()!=null && model.getSolutionType() ==0){
+                queryWrapper.exists("select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId());
+            }else if(model.getSolutionType()!=null && model.getSolutionType() ==1){
+                queryWrapper.eq(Solutions::getShopId,loginUserInfo.getCompanyId());
+            }else{
+                queryWrapper.apply("((t2.type=0 and exists(select cs.id from company_solution cs where cs.isdeleted=0 and cs.company_id=t1.company_id and cs.shop_id="+loginUserInfo.getCompanyId()+")) or (" +
+                        "t2.type=1 and t2.shop_id="+loginUserInfo.getCompanyId()+"))") ;
+            }
+        }else{
+            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+            }else{
+                queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+            }
+            queryWrapper.eq(model.getCompanyId()!=null,InsuranceApply::getCompanyId, model.getCompanyId());
+        }
 
-        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
+        queryWrapper.orderByDesc(ApplyDetail::getCreateDate);
+        List<ApplyChange> list =applyChangeJoinMapper.selectJoinList(ApplyChange.class,queryWrapper);
+        if(Constants.equalsObject(model.getGetFiles(),Constants.ONE)){
+            //濡傛灉鏄悎骞跺崟,闇�瑕佹煡璇㈤檮浠朵俊鎭�
+            initFileForList(list);
+        }
+        return list;
+    }
+    private void initFileForList(List<ApplyChange> list) {
+        List<Integer> objList =  new ArrayList<>();
+        if(list!=null && list.size()>0){
+            for(ApplyChange param : list){
+                objList.add(param.getId());
+            }
+        }else{
+            return;
+        }
+        List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                .in(Multifile::getObjId,objList)
+                .in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.CA_PD_PDF.getKey()}))
+                .eq(Multifile::getIsdeleted,Constants.ZERO)
+                .orderByAsc(Multifile::getId));
+        if(multifiles!=null && multifiles.size()>0){
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+                    +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+            for(ApplyChange model : list){
+                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());
+                    }
+                    model.setPidanFileList(multifileList);
+                }
             }
         }
-        PageData<ApplyChange> pageData = PageData.from(applyChangeJoinMapper.selectJoinPage(page,ApplyChange.class, queryWrapper));
-        return pageData;
+
     }
 
 
@@ -844,7 +2050,7 @@
     public void changeOpt(ApplyChangeOptDTO applyChangeOptDTO){
         if(Objects.isNull(applyChangeOptDTO)
                 ||Objects.isNull(applyChangeOptDTO.getApplyId())
-                ||StringUtils.isBlank(applyChangeOptDTO.getOptIllustration())){
+        ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -860,18 +2066,48 @@
         if(applyChange.getIsdeleted().equals(Constants.ONE)){
             throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"鏁版嵁宸插垹闄�,鏃犳硶杩涜璇ユ搷浣�");
         }
-        Constants.ApplyChangeLogStatus applyChangeLogStatus = Constants.ApplyChangeLogStatus.RETURN_APPLY;
-        if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())
-                ||applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())){
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_PLATFORM_CHECK_PASS_NO;
+
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        if(applyChange.getType().equals(Constants.ONE)){
+            noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
+        }
+        if(applyChangeOptDTO.getOptType().equals(3)){
             //鍙戣捣閫�鍥炵敵璇�
-            if(loginUserInfo.getType().equals(Constants.ONE)){
+            if(!loginUserInfo.getType().equals(Constants.ONE)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
             }
-            if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey()) ){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
+            if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())
+                || applyChange.getStatus().equals(Constants.ApplyChangeStatus.SIGNATURE.getKey()))){
+                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘閫�鍥炵敵璇�!");
             }
-        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
-            applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_AGREE;
+
+            if(applyChange.getStatus().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())){
+                applyChange.setStatus(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey());
+            }else{
+                applyChange.setStatus(Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey());
+            }
+
+            //瀛樺偍寰呭姙淇℃伅
+            //鍒犻櫎鍏朵粬寰呭姙
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
+            Notices notices = new Notices(noticeObjectType,Constants.ZERO,applyChange.getId(),solutions.getName(),
+                    insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
+            noticesMapper.insert(notices);
+            //鍟嗘埛寰呭姙
+            if(Objects.nonNull(solutions.getShopId())){
+                Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+                        applyChange.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
+                noticesMapper.insert(shopNotices);
+            }
+
+        }else if(applyChangeOptDTO.getOptType().equals(4)){
+            applyLogType = Constants.ApplyLogType.CA_PLATFORM_AGREE_BACK_APPLY;
             //骞冲彴鍚屾剰閫�鍥�
             if(loginUserInfo.getType().equals(Constants.ZERO)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
@@ -881,8 +2117,8 @@
                     )){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
             }
-        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.UPLOAD.getKey())){
-            applyChangeLogStatus = Constants.ApplyChangeLogStatus.PLATFORM_UN_AGREE;
+        }else if(applyChangeOptDTO.getOptType().equals(5)){
+            applyLogType = Constants.ApplyLogType.CA_PALTFORM_REFUSE_APPLY;
             //骞冲彴椹冲洖閫�鍥�
             if(loginUserInfo.getType().equals(Constants.ZERO)){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲钩鍙扮鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
@@ -892,22 +2128,38 @@
                     )){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
             }
-        }else if(applyChangeOptDTO.getOptType().equals(Constants.ApplyChangeStatus.CLOSE.getKey())){
-            applyChangeLogStatus = Constants.ApplyChangeLogStatus.CLOSE;
-            //浼佷笟鍏抽棴
-            if(loginUserInfo.getType().equals(Constants.ONE)){
-                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰紒涓氱鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�");
+            if(applyChange.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey())){
+                applyChange.setStatus(Constants.ApplyChangeStatus.UPLOAD.getKey());
+            }else{
+                applyChange.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
             }
-            if(!applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())){
+        }else if(applyChangeOptDTO.getOptType().equals(6)){
+            //浼佷笟鍏抽棴
+            applyLogType = Constants.ApplyLogType.CA_COMPANY_CLOSE;
+            if(!(applyChange.getStatus().equals(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey())
+                    ||applyChange.getStatus().equals(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()))){
                 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀敊璇棤娉曡繘琛岃鎿嶄綔!");
             }
+            applyChange.setStatus(Constants.ApplyChangeStatus.CLOSE.getKey());
+            //瀛樺偍寰呭姙淇℃伅
+            //鍒犻櫎鍏朵粬寰呭姙
+            noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,applyChange.getId()));
+
         }else{
             throw new BusinessException(ResponseStatus.BAD_REQUEST  );
         }
-        applyChange.setStatus(applyChangeOptDTO.getOptType());
+        applyChange.setEditor(loginUserInfo.getId());
+        applyChange.setEditDate(new Date());
         applyChangeMapper.updateById(applyChange);
-//        //瀛樺偍鏃ュ織鏁版嵁
-        this.saveApplyLog(applyChange,applyChangeLogStatus,applyChangeOptDTO.getOptIllustration());
+
+        String info = applyLogType.getInfo();
+        if(StringUtils.isNotBlank(applyChangeOptDTO.getOptIllustration())){
+            info = info.replace("${param}", applyChangeOptDTO.getOptIllustration());
+        }else{
+            info = info.replace("${param}", "");
+        }
+        ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
+        applyLogMapper.insert(log);
     }
 
 
@@ -916,16 +2168,77 @@
         MPJLambdaWrapper<ApplyChange> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(ApplyChange.class)
                 .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
+                .selectAs(Company::getId,ApplyChange::getCompanyId)
                 .selectAs(Company::getName,ApplyChange::getCompanyName)
+                .selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
+                .selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
+                .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
+                .selectAs(Solutions::getType,ApplyChange::getSolutionType)
+                .selectAs(Solutions::getId,ApplyChange::getSolutionsId)
+                .selectAs(Solutions::getDelOnlyReplace,ApplyChange::getDelOnlyReplace)
                 .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)
                 .select("( select count(1) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID and ad.TYPE = 2  )",ApplyChange::getChangeNum)
-                .select("( select ifnull(sum(ad.FEE),0) from apply_chagne_detail ad where t.id = ad.APPLY_CHANGE_ID  )",ApplyChange::getChangeMoney)
+                .select(" ( select max(ac.APPLY_START_TIME) from apply_change ac  where ac.apply_id = t.apply_id and ac.status = 2 ) as lastChangeDate")
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                 .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(ApplyChange::getId,id);
         ApplyChange applyChange =  applyChangeJoinMapper.selectOne(queryWrapper);
+
+        //鏌ヨ鎿嶄綔璁板綍
+        List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
+                new MPJLambdaWrapper<ApplyLog>()
+                        .selectAll(ApplyLog.class)
+                        .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName)
+                        .selectAs(SystemUser::getType,ApplyLog::getCreatorType)
+                        .selectAs(Company::getName,ApplyLog::getCompanyName)
+                        .leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
+                        .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                        .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.ONE))
+                        .eq(ApplyLog::getObjId,applyChange.getId())
+                        .orderByAsc(ApplyLog::getCreateDate)
+        );
+        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()
+//                        ,Constants.MultiFile.CA_PD_PDF.getKey()
+//                        ,Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey()}))
+                .eq(Multifile::getIsdeleted,Constants.ZERO));
+        if(multifiles!=null){
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+                    +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+            for(Multifile f : multifiles){
+                if(StringUtils.isBlank(f.getFileurl())){
+                    continue;
+                }
+                f.setFileurlFull(path+f.getFileurl());
+                if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey())){
+                    //绛剧讲鍚庣敵璇峰崟
+                    applyChange.setApplyFile(f);
+                }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);
+//                }
+            }
+            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);
+            }
+        }
+
         return applyChange;
     }
     /**
@@ -936,7 +2249,7 @@
     @Override
     public  ApplyChange  exportChangeUnitExcel(ApplyChange param){
         ApplyChange model = findJoinDetail(param);
-        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
 
@@ -945,6 +2258,89 @@
         model.setChangeDetailList(detailList!=null?detailList:new ArrayList<>());
         model.setChangeNum(model.getChangeDetailList().size());
         return model;
+    }
+    /**
+     * 瀵煎嚭鎹㈠巶鐢宠琛�
+     * @param param
+     * @return
+     */
+    @Override
+    public  String  getSignLinkJiajiabao(ApplyChange param){
+        ApplyChange model = exportJiajianBaoExcel(param);
+        return  getOnlineSignLink(model);
+    }
+    /**
+     * 瀵煎嚭鎹㈠巶鐢宠琛�
+     * @param param
+     * @return
+     */
+    @Override
+    public  String  getSignLinkChangeUnit(ApplyChange param){
+        ApplyChange model = exportChangeUnitExcel(param);
+        return  getOnlineSignLink(model);
+    }
+
+    private String getOnlineSignLink(ApplyChange model) {
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+        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(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+
+        Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        String fileUrl = null;
+        if(Constants.equalsObject(model.getType(), Constants.ONE)){
+              fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"鎹㈠巶鐢宠琛�","鎶曚繚浼佷笟");
+        }else{
+            fileUrl = ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcelToPdf(model,"鍔犲噺淇濈敵璇疯〃","鎶曚繚浼佷笟");
+        }
+        String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+        notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+        String applyNo = signService.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(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        String link = signService.signLink(applyNo,company.getName(),company.getCode());
+        if(StringUtils.isBlank(link) ){
+            throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+        }
+        ApplyChange update= new ApplyChange();
+        update.setId(model.getId());
+        update.setEditor(user.getId());
+        update.setEditDate(new Date());
+        update.setSignApplyNo(applyNo);
+        applyChangeMapper.updateById(update);
+
+        return  link;
     }
 
 
@@ -957,7 +2353,7 @@
     public  ApplyChange  exportJiajianBaoExcel(ApplyChange param){
 
         ApplyChange model = findJoinDetail(param);
-        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getType())){
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
             throw new BusinessException(ResponseStatus.DATA_EMPTY);
         }
 
@@ -983,12 +2379,13 @@
                 .selectAll(ApplyChange.class)
                 .selectAs(Solutions::getName,ApplyChange::getSolutionsName)
                 .selectAs(Company::getName,ApplyChange::getCompanyName)
+                .selectAs(InsuranceApply::getCompanyId,ApplyChange::getCompanyId)
                 .selectAs(InsuranceApply::getCode,ApplyChange::getApplyCode)
                 .selectAs(InsuranceApply::getStartTime,ApplyChange::getStartTime)
-                .selectAs(InsuranceApply::getStartTime,ApplyChange::getEndTime)
+                .selectAs(InsuranceApply::getEndTime,ApplyChange::getEndTime)
                 .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
                 .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
-                .leftJoin(Company.class,Company::getId,ApplyChange::getCompanyId)
+                .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
                 .eq(ApplyChange::getId,param.getId())
                 .last("limit 1");
 
@@ -1000,7 +2397,7 @@
                 .selectAll(ApplyChagneDetail.class)
                 .selectAs(Member::getName,ApplyChagneDetail::getMemberName)
                 .selectAs(Member::getSex,ApplyChagneDetail::getSex)
-                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo)
                 .selectAs(Worktype::getName,ApplyChagneDetail::getWorkTypeName)
                 .selectAs(DispatchUnit::getName,ApplyChagneDetail::getDuName)
                 .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
@@ -1022,7 +2419,7 @@
                 .select("t3.name as oldWorktypeName")
                 .select("t4.name as oldDuName")
                 .selectAs(Member::getSex,ApplyChagneDetail::getSex)
-                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo)
+                .selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo)
                 .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId)
                 .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId)
                 .leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId)
@@ -1036,4 +2433,345 @@
     }
 
 
+    /**
+     * 鍔犲噺淇濈敵璇锋椂 鏌ヨ鍔犲噺閲戦
+     * @param applyChangeCyclePriceDTO
+     * @return
+     */
+    @Override
+    public CountCyclePriceVO getChangeCountCyclePriceVO(ApplyChangeCyclePriceDTO applyChangeCyclePriceDTO){
+        if(Objects.isNull(applyChangeCyclePriceDTO)
+            || Objects.isNull(applyChangeCyclePriceDTO.getApplyId())
+            || Objects.isNull(applyChangeCyclePriceDTO.getValidTime())){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChangeCyclePriceDTO.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(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getIsdeleted,Constants.ZERO).eq(ApplyDetail::getApplyId,insuranceApply.getId()).last("limit 1"));
+        if(Objects.isNull(applyDetail)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏄庣粏璁板綍");
+        }
+        //鏍规嵁鎵瑰崟鏃ユ湡 鍜� 缁撴潫鏃ユ湡 璁$畻閲戦
+        //楠岃瘉鎵瑰崟鏃ユ湡鏄惁鍦ㄥ綋鍓嶆棩鏈熷悗 涓� 鍦ㄤ繚鍗曠粨鏉熸棩鏈熷墠 鐢宠鏃堕棿蹇呴』澶勪簬淇濆崟鐨勬椂闂磋寖鍥村唴
+//        if (!(DateUtil.compareDate( insuranceApply.getStartTime(),applyChangeCyclePriceDTO.getValidTime()) >= Constants.ZERO
+//                && DateUtil.compareDate( applyChangeCyclePriceDTO.getValidTime(),insuranceApply.getEndTime()) >= Constants.ZERO)) {
+//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鐢宠鏃ユ湡鏈浜庝繚鍗曟棩鏈熷唴锛屾棤娉曡繘琛岃鎿嶄綔");
+//        }
+        BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
+        CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
+        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()
+                ,insuranceApply.getStartTime(),
+                DateUtil.getMontageDate(
+                        DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getDelValidDays()),3)));
+        returnCountCyclePriceVO.setReducePrice(reducePrice);
+        return returnCountCyclePriceVO;
+    }
+
+    /**
+     * 璁$畻淇濆崟涓�  X澶� 澶氬皯璐圭敤
+     * @param applyId
+     * @param optDays
+     * @return
+     */
+    public BigDecimal getApplyPrice(Integer applyId,Integer optDays){
+        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyId);
+        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(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        //鎬诲ぉ鏁�
+        Integer sumDays = DateUtil.daysBetweenDates(insuranceApply.getEndTime(),insuranceApply.getStartTime()) + 1;
+        CountCyclePriceVO countCyclePriceVO = Constants.countPriceVO(insuranceApply.getStartTime(),solutions);
+        //鎬婚噾棰�
+        BigDecimal sumPrice = countCyclePriceVO.getCyclePrice();;
+        return sumPrice.divide(new BigDecimal(sumDays),2, RoundingMode.HALF_UP).multiply(new BigDecimal(optDays));
+    }
+
+    public  ApplyChange  queryApplyChangeData(Integer applyChangeId){
+        ApplyChange model = findDetail(applyChangeId);
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        MPJLambdaWrapper<ApplyChagneDetail> queryWrapper = new MPJLambdaWrapper<>();
+        queryWrapper.selectAll(ApplyChagneDetail.class);
+        queryWrapper.select("t2.name",ApplyChagneDetail::getWorkTypeName);
+        queryWrapper.select("t3.name",ApplyChagneDetail::getDuName);
+        queryWrapper.select("t4.name",ApplyChagneDetail::getOldWorkTypeName);
+        queryWrapper.select("t5.name",ApplyChagneDetail::getOldDuName);
+        queryWrapper.selectAs(Member::getName,ApplyChagneDetail::getMemberName);
+        queryWrapper.selectAs(Member::getSex,ApplyChagneDetail::getSex);
+        queryWrapper.selectAs(Member::getIdcardNo,ApplyChagneDetail::getMemberIdcardNo);
+        queryWrapper.leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId);
+        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getWorktypeId);
+        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getDuId);
+        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyChagneDetail::getOldWorktypeId);
+        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyChagneDetail::getOldDuId);
+        queryWrapper.eq(ApplyChagneDetail::getApplyChangeId,applyChangeId);
+        List<ApplyChagneDetail> list = applyChangeDetailJoinMapper.selectJoinList(ApplyChagneDetail.class, queryWrapper);
+        for (ApplyChagneDetail applyChagneDetail:list) {
+            applyChagneDetail.setAge(Constants.getAgeByIdCard(applyChagneDetail.getMemberIdcardNo()));
+        }
+        if(CollectionUtils.isNotEmpty(list)){
+            model.setAddDetailList(list.stream().filter(m->m.getType().equals(Constants.ZERO)).collect(Collectors.toList()));
+            model.setDelDetailList(list.stream().filter(m->m.getType().equals(Constants.ONE)).collect(Collectors.toList()));
+            model.setChangeDetailList(list.stream().filter(m->m.getType().equals(Constants.TWO)).collect(Collectors.toList()));
+        }
+        return model;
+    }
+
+    /**
+     * 浜哄憳鍚嶅崟绛剧珷
+     */
+    @Override
+    public String getChangeMemberListOnlineSignLink(SmsCheckDTO smsCheckDTO) {
+        if(Objects.isNull(smsCheckDTO)
+                || Objects.isNull(smsCheckDTO.getBusinessId())
+//                || StringUtils.isBlank(smsCheckDTO.getCode())
+        ){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        ApplyChange model = this.queryApplyChangeData(smsCheckDTO.getBusinessId());
+        if(Objects.isNull(model)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠姞鍑忎繚/鎹㈠巶淇℃伅");
+        }
+        if(Objects.isNull(model) ||! Constants.equalsInteger(Constants.ZERO,model.getIsdeleted())){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        Company company = companyMapper.selectById(model.getCompanyId());
+        if(company== null || StringUtils.isBlank( company.getEmail()) || !Constants.equalsInteger(company.getSignStatus(),Constants.THREE)){
+            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟灏氭湭鍏峰鍦ㄧ嚎绛剧珷鏉′欢锛岃鑱旂郴骞冲彴绠$悊鍛樼‘璁");
+        }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        String fileUrl = null;
+        if(solutions.getType().equals(Constants.ONE)){
+            if(!Constants.equalsInteger(Constants.ZERO,model.getStatus())){
+                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔绛剧珷鎿嶄綔锛�");
+            }
+            if(Constants.equalsObject(model.getType(), Constants.ONE)){
+                fileUrl = ExcelExporter.build(ApplyChange.class).exportChangeUnitExcelToPdf(model,"鎹㈠巶鐢宠琛�","琚繚闄╀汉");
+            }else{
+                fileUrl = ExcelExporter.build(ApplyChange.class).exportJiajianBaoExcelToPdf(model,"鍔犲噺淇濈敵璇疯〃","琚繚闄╀汉");
+            }
+            String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
+            notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",model.getId().toString());
+
+            //涓存椂浣跨敤
+//            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(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+            }
+            String link = signService.signLink(applyNo,company.getName(),company.getCode());
+            if(StringUtils.isBlank(link) ){
+                throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+            }
+            ApplyChange update= new ApplyChange();
+            update.setId(model.getId());
+            update.setEditor(user.getId());
+            update.setEditDate(new Date());
+            update.setSignMemberListNo(applyNo);
+            applyChangeMapper.updateById(update);
+            return link;
+        }else{
+            if(model.getType().equals(Constants.ONE)){
+                return this.getSignLinkChangeUnit(model);
+            }else{
+                return this.getSignLinkJiajiabao(model);
+            }
+
+
+
+        }
+    }
+
+
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+    public Integer check(ApplyChange applyChange,UnionChangeServiceImpl unionChangeService) {
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
+        }
+        if(applyChange.getId() == null){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST);
+        } 
+        if(Objects.isNull(applyChange)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        ApplyChange model = applyChangeJoinMapper.selectJoinOne(ApplyChange.class,
+                new MPJLambdaWrapper<ApplyChange>()
+                        .selectAll(ApplyChange.class)
+                        .selectAs(InsuranceApply::getSolutionId,ApplyChange::getSolutionsId)
+                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+                        .eq(ApplyChange::getId,applyChange.getId())
+                        .last(" limit 1")
+        );
+
+        if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Solutions solutions = solutionsMapper.selectById(model.getSolutionsId());
+        if(Objects.isNull(solutions)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
+        }
+        if(solutions.getType().equals(Constants.ZERO)){
+           throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐩翠繚鍗曟嵁鏃犳硶杩涜璇ユ搷浣�");
+        }else{
+            if(!Constants.equalsInteger(model.getStatus(),Constants.ApplyChangeStatus.SIGNATURE.getKey())){
+                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+            }
+        }
+
+        ApplyChange update = new ApplyChange();
+        update.setEditDate(new Date());
+        update.setEditor(user.getId());
+        update.setCheckDate(update.getEditDate());
+        update.setCheckInfo(applyChange.getCheckInfo());
+        update.setCheckUserId(user.getId());
+        update.setId(model.getId());
+        if(applyChange.getDealBackApply() ==1){
+            //濡傛灉鏄笉閫氳繃
+            update.setStatus(Constants.ApplyChangeStatus.PLATFORM_AGREE.getKey());
+        }else{
+            update.setStatus(Constants.ApplyChangeStatus.CHECHED_PASSED.getKey());
+        }
+        applyChangeJoinMapper.updateById(update);
+
+
+        Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_AUDIT;
+        String info = applyChange.getCheckInfo();
+        if(StringUtils.isNotBlank(applyChange.getCheckInfo())){
+            info = info.replace("${param}", applyChange.getCheckInfo());
+        }else{
+            info = info.replace("${param}", "");
+        }
+        ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(), null, null);
+        applyLogMapper.insert(log);
+
+        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
+        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;
+
+    }
+
+
+
+
+//    BigDecimal cycle1 = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
+//
+//                if(solutions.getTimeUnit().equals(Constants.TimeUnit.MONTH.getValue())){
+//                    if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+//                    }else{
+//                        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+//                    }
+//                }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.QUARTER.getValue())){
+//                    if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        return fee.multiply(cycle).divide(new BigDecimal(3),2, RoundingMode.HALF_UP);
+//                    }else{
+//                        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+//                    }
+//                }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.HALF_YEAR.getValue())){
+//                    if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        return fee.multiply(cycle).divide(new BigDecimal(6),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+//                    }else{
+//                        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+//                    }
+//                }else if(solutions.getTimeUnit().equals(Constants.TimeUnit.YEAR.getValue())){
+//                    if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(days).divide(Constants.InsureCycleUnit.HALF_MONTH.getDays(),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(24),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        return fee.multiply(cycle).divide(new BigDecimal(12),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(4),2, RoundingMode.HALF_UP);
+//                    }else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())){
+//                        BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
+//                        cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
+//                        return fee.multiply(cycle).divide(new BigDecimal(2),2, RoundingMode.HALF_UP);
+//                    }else{
+//                        throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+//                    }
+//                }else{
+//                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
+//                }
+
 }

--
Gitblit v1.9.3