From 16c14e07a13fa1f2e2cba0f4e33acef8e7d5670e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:27:26 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 13 +-----
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 70 ++++++++++++++++++----------------
2 files changed, 40 insertions(+), 43 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 a7ca3b0..c29e035 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
@@ -2677,7 +2677,6 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濆崟鏁版嵁");
}
SaveUnionChangeDTO saveUnionChangeDTO = new SaveUnionChangeDTO();
-// saveUnionChangeDTO.setApplyDate(update.getApplyStartTime());
saveUnionChangeDTO.setApplyDate(model.getValidTime());
List<Integer> applyIds = new ArrayList<>();
applyIds.add(model.getId());
@@ -2685,27 +2684,21 @@
saveUnionChangeDTO.setApplyChange(model);
saveUnionChangeDTO.setUnionApplyId(insuranceApply.getUnionApplyId());
saveUnionChangeDTO.setBusinessType(model.getType());
-// if(Constants.equalsInteger(model.getType(),Constants.ONE)){
-// }
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
saveUnionChangeDTO.setShopId(user.getCompanyId());
}else{
- CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda().eq(CompanySolution::getSolutionId,solutions.getId()).eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId()).last(" limit 1 "));
+ 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());
}
-// if(1==1){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY);
-// }
unionChangeService.merge(saveUnionChangeDTO);
}
-// if(1==1){
-// throw new BusinessException(ResponseStatus.DATA_EMPTY);
-// }
return 1;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index deac02d..854d8c4 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -1,6 +1,7 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.api.R;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.constants.ResponseStatus;
@@ -377,33 +378,37 @@
}
if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
// saveUnionChangeDTO.setApplyDate(unionApply.getStartTime());
-
- saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
- saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
- //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
- if(Objects.nonNull(solutions.getAddValidDays())){
- saveUnionChangeDTO.setAddValidDate(
- DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getAddValidDays())
- );
+ if(unionApply.getStartTime().getTime()>System.currentTimeMillis()){
+ saveUnionChangeDTO.setAddValidDate(unionApply.getStartTime());
+ saveUnionChangeDTO.setDelValidDate(unionApply.getStartTime());
}else{
saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
- }
- if(Objects.nonNull(solutions.getDelValidDays())){
- saveUnionChangeDTO.setDelValidDate(
- DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getDelValidDays())
- );
- }else{
saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
- }
- //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
- //鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(saveUnionChangeDTO.getAddValidDate().getTime()<unionApply.getStartTime().getTime()
- || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
- }
- if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
- || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
+ if(Objects.nonNull(solutions.getAddValidDays())){
+ saveUnionChangeDTO.setAddValidDate(
+ DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getAddValidDays())
+ );
+ }else{
+ saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
+ }
+ if(Objects.nonNull(solutions.getDelValidDays())){
+ saveUnionChangeDTO.setDelValidDate(
+ DateUtil.afterDateByType(saveUnionChangeDTO.getApplyDate(),0,solutions.getDelValidDays())
+ );
+ }else{
+ saveUnionChangeDTO.setDelValidDate(saveUnionChangeDTO.getApplyDate());
+ }
+ //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
+ //鑾峰彇寮�濮嬫棩鏈熸鏃�
+ if(saveUnionChangeDTO.getAddValidDate().getTime()<unionApply.getStartTime().getTime()
+ || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ }
+ if(saveUnionChangeDTO.getDelValidDate().getTime()<unionApply.getStartTime().getTime()
+ || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ }
}
}else{
// if(saveUnionChangeDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
@@ -946,6 +951,7 @@
.eq(InsuranceApply::getId, applyChange.getApplyId())
);
applyChange.setFee(bigDecimalVO.getTotalFee());
+
}
@@ -1071,17 +1077,15 @@
//濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
if(reduceDate.getTime() > oldModel.getStartTime().getTime()){
reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
-// if(reduceDate.getTime()<oldModel.getStartTime().getTime()){
-// reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
-// }else{
-// reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
-// }
- }else{
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
+ }else if(reduceDate.getTime()<oldModel.getStartTime().getTime()){
reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
}
- //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
- reduceFee = Constants.reduceFee(
- solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
BigDecimal pullFee = BigDecimal.ZERO;
if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
--
Gitblit v1.9.3