From af9932d1d6fe3bd56799dcd8b4d76dc993c5c1db Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 六月 2024 09:42:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 4a5ac91..e3e32ca 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
@@ -17,6 +17,7 @@
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;
@@ -685,6 +686,7 @@
.set(ApplyDetail::getEndTime, delValidTime)
.set(ApplyDetail::getEditor, update.getEditor())
.set(ApplyDetail::getEditDate, update.getEditDate())
+
.eq(ApplyDetail::getId, oldModel.getId())
);
totalFee = totalFee.add(updateFee).subtract(oldModel.getFee());
@@ -703,12 +705,6 @@
.set( ApplyChagneDetail::getEndTime, delValidTime)
.eq(ApplyChagneDetail::getId,detail.getId())
);
-
-// if(1==1){
-// throw new BusinessException(ResponseStatus.SERVER_ERROR);
-// }
-
-
}
member.setApplyId(update.getApplyId());
@@ -1219,6 +1215,7 @@
applyChagneDetail.setApplyDetailId(applyDetail.getId());
applyChagneDetail.setStartTime(applyDetail.getStartTime());
applyChagneDetail.setEndTime(endTime);
+ applyChagneDetail.setReduceMoney(BigDecimal.ZERO);
member.setApplyId(insuranceApply.getId());
member.setDuId(applyChagneDetail.getDuId());
@@ -1229,6 +1226,7 @@
//鏌ヨ鍑忎繚鏃ユ湡
// Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
// ;
+
//鏌ヨ鍛ㄦ湡鏁伴噺
applyChagneDetail.setFee(
Constants.reduceFee(solutions,
@@ -1239,6 +1237,11 @@
applyDetail.getStartTime(),endTime)
.subtract(applyDetail.getFee()
));
+ //濡傛灉鏄噺淇濅笟鍔′负浠呮浛鎹� 涓� 鏂规鐨勬墸璐瑰懆鏈熷拰鎬诲懆鏈熺浉绛� 鍒欏鐞嗗噺淇濊垂鐢�
+ if(Constants.equalsInteger(solutions.getDelOnlyReplace(),Constants.ONE)
+ && Constants.equalsInteger(solutions.getTimeUnit(),solutions.getInsureCycleUnit())){
+ applyChagneDetail.setReduceMoney(solutions.getPrice().multiply(new BigDecimal(-1)));
+ }
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
--
Gitblit v1.9.3