From f4d7a1d8322c37349aeee87287eceb7eb56ce49a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 20 五月 2025 10:00:01 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 72 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 34 deletions(-)
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..b57877d 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());
+
}
@@ -958,7 +964,7 @@
, BigDecimalVO bigDecimalVO,List<ApplyChagneDetail> reduceList,Integer i){
//鏌ヨ浜哄憳淇℃伅鏄惁瀛樺湪鐩稿悓鐨勬柟妗堜笅鏄惁瀛樺湪 鍐茬獊鏁版嵁
InsuranceApplyServiceImpl.checkStaticMemberSolution(solutions.getBaseId(),
- detail.getIdcardNo(),detail.getMemberName(),DateUtil.getMontageDate(applyChange.getApplyStartTime(),1),DateUtil.getMontageDate(detail.getEndTime(),2),
+ detail.getMemberId(),detail.getIdcardNo(),detail.getMemberName(),DateUtil.getMontageDate(applyChange.getApplyStartTime(),1),DateUtil.getMontageDate(detail.getEndTime(),2),
applyDetailJoinMapper);
//鍔犱繚
@@ -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