From 44a0ef1620cad87479390900eb6ded041c7b8d7b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 17 五月 2024 16:56:31 +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/UnionChangeServiceImpl.java | 438 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 264 insertions(+), 174 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 1efb65a..ef47549 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
@@ -167,7 +167,6 @@
.eq(UnionChange::getId,id)
.last(" limit 1 ")
);
-
if(!Objects.isNull(unionChange)){
//鏌ヨ鍔犲噺淇濇槑缁嗘暟鎹�
List<ApplyChagneDetail> applyChangeList = applyChagneDetailJoinMapper
@@ -176,18 +175,18 @@
.eq(ApplyChagneDetail::getIsdeleted,Constants.ZERO)
.ne(ApplyChagneDetail::getType,Constants.TWO)
.eq(ApplyChagneDetail::getUnionChangeId,unionChange.getId()));
- BigDecimal fee = BigDecimal.ZERO;
- for (ApplyChagneDetail applyChagneDetail:applyChangeList) {
- Integer maxDays = DateUtil.calculateBetween(unionChange.getApplyStartTime(),applyChagneDetail.getEndTime(),0);
- if(applyChagneDetail.getType().equals(Constants.ONE)){
- maxDays = DateUtil.daysBetweenDates(applyChagneDetail.getEndTime(),DateUtil.getMontageDate(unionChange.getApplyStartTime(),3));
- }
- if(applyChagneDetail.getType().equals(Constants.ZERO)){
- fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
- }else{
- fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
- }
- }
+ BigDecimal fee = applyChangeList.stream().map(m->m.getFee()).reduce(BigDecimal.ZERO,BigDecimal::add);
+// for (ApplyChagneDetail applyChagneDetail:applyChangeList) {
+// Integer maxDays = DateUtil.calculateBetween(unionChange.getApplyStartTime(),applyChagneDetail.getEndTime(),0);
+// if(applyChagneDetail.getType().equals(Constants.ONE)){
+// maxDays = DateUtil.daysBetweenDates(applyChagneDetail.getEndTime(),DateUtil.getMontageDate(unionChange.getApplyStartTime(),3));
+// }
+// if(applyChagneDetail.getType().equals(Constants.ZERO)){
+// fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
+// }else{
+// fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
+// }
+// }
unionChange.setFee(fee.setScale(2, RoundingMode.HALF_UP));
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
@@ -324,13 +323,18 @@
if (pageWrap.getModel().getSignApplyNo() != null) {
queryWrapper.eq(UnionChange::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ if(pageWrap.getSorts().size() == 0){
+ queryWrapper.orderByDesc(UnionChange::getCreateDate );
+ }else {
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
}
}
+
PageData<UnionChange> pageData = PageData.from(unionChangeJoinMapper.selectJoinPage(page,UnionChange.class, queryWrapper));
return pageData;
}
@@ -350,10 +354,13 @@
if(!user.getType().equals(Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�");
}
+ if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
+ //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
+ saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
+ }
if(Objects.isNull(saveUnionChangeDTO)
|| Objects.isNull(saveUnionChangeDTO.getApplyIds())
- || Objects.isNull(saveUnionChangeDTO.getAddValidDate())
- || Objects.isNull(saveUnionChangeDTO.getDelValidDate())
+ || Objects.isNull(saveUnionChangeDTO.getApplyDate())
|| Objects.isNull(saveUnionChangeDTO.getUnionApplyId())
|| Objects.isNull(saveUnionChangeDTO.getBusinessType())
){
@@ -364,16 +371,44 @@
if(Objects.isNull(unionApply)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟鏁版嵁");
}
- //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
- //鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(saveUnionChangeDTO.getAddValidDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
- || saveUnionChangeDTO.getAddValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- if(saveUnionChangeDTO.getDelValidDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
- || saveUnionChangeDTO.getDelValidDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)){
+ //鏍规嵁鐢宠鏃ユ湡 澶勭悊鍔犲噺淇濈殑 瀹為檯鐢熸晥鏃ユ湡
+ 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()
+ || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎹㈠巶鐢熸晥鏈熼敊璇�");
+ }
+ saveUnionChangeDTO.setAddValidDate(saveUnionChangeDTO.getApplyDate());
}
+
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -637,6 +672,7 @@
unionChangeBXDDTO.getDelValidTime() == null ){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ unionChangeBXDDTO.setApplyId(unionChange.getUnionApplyId());
unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
if(!unionChange.getShopId().equals(user.getCompanyId())){
@@ -655,17 +691,26 @@
if(Objects.isNull(unionApply)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟淇℃伅");
}
- //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
- //鑾峰彇寮�濮嬫棩鏈熸鏃�
- if(unionChangeBXDDTO.getApplyDate().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
- || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ Solutions solutions = solutionsMapper.selectById(unionApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- if(unionChangeBXDDTO.getDelValidTime().getTime()<DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
- || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ if(unionChange.getType().equals(Constants.ZERO)){
+ //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
+ //鑾峰彇寮�濮嬫棩鏈熸鏃�
+ if(unionChangeBXDDTO.getApplyDate().getTime()<unionApply.getStartTime().getTime()
+ || unionChangeBXDDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍔犱繚鐢熸晥鏈熼敊璇�");
+ }
+ if(unionChangeBXDDTO.getDelValidTime().getTime()<unionApply.getStartTime().getTime()
+ || unionChangeBXDDTO.getDelValidTime().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鍑忎繚鐢熸晥鏈熼敊璇�");
+ }
+ }else{
+ if(unionChangeBXDDTO.getApplyDate().getTime()<unionChange.getApplyStartTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏃ユ湡蹇呴』澶т簬鐢宠鏃ユ湡");
+ }
}
-
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -741,6 +786,7 @@
.selectAs(Member::getName, ApplyChagneDetail::getMemberName)
.selectAs(Solutions::getName,ApplyChagneDetail::getSolutionsName)
.selectAs(InsuranceApply::getCode,ApplyChagneDetail::getApplyCode)
+ .selectAs(InsuranceApply::getServerCost,ApplyChagneDetail::getServerCost)
.leftJoin(ApplyChange.class, ApplyChange::getId, ApplyChagneDetail::getApplyChangeId)
.leftJoin(Member.class, Member::getId, ApplyChagneDetail::getMemberId)
.leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyChange::getApplyId)
@@ -748,7 +794,7 @@
.leftJoin(Worktype.class, Worktype::getId, ApplyChagneDetail::getWorktypeId)
.leftJoin(DispatchUnit.class, DispatchUnit::getId, ApplyChagneDetail::getDuId)
.eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
- this.dealApplyChangeDetail(applyChange,allList);
+ this.dealApplyChangeDetail(applyChange,allList,solutions);
applyChangeJoinMapper.updateById(applyChange);
//瀛樺偍鎵瑰崟瀹屾垚淇℃伅
@@ -789,37 +835,34 @@
- public void dealApplyChangeDetail(ApplyChange applyChange,List<ApplyChagneDetail> applyChagneDetailList){
+ public void dealApplyChangeDetail(ApplyChange applyChange,List<ApplyChagneDetail> applyChagneDetailList,Solutions solutions){
BigDecimalVO bigDecimalVO = new BigDecimalVO();
bigDecimalVO.setTotalFee(BigDecimal.ZERO);
bigDecimalVO.setCurrentFee(BigDecimal.ZERO);
+ InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyChange.getApplyId());
for (ApplyChagneDetail detail:applyChagneDetailList) {
Member member = memberMapper.selectById(detail.getMemberId());
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
}
if (Constants.equalsInteger(detail.getType(), Constants.ZERO)) {
- this.addChangeDetailData(applyChange,detail,bigDecimalVO);
+ this.addChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
}else if(Constants.equalsInteger(detail.getType(),Constants.ONE)){
- this.reduceChangeDetailData(applyChange,detail,bigDecimalVO);
+ this.reduceChangeDetailData(applyChange,detail,insuranceApply,solutions,bigDecimalVO);
}else{
- this.otherChangeDetailData(applyChange,detail);
+ this.otherChangeDetailData(applyChange,detail,insuranceApply);
}
}
-
- if (bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0) {
- //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
- insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + bigDecimalVO.getTotalFee())
- .setSql(" current_fee = ifnull(current_fee,0)+" + bigDecimalVO.getCurrentFee())
- .set(InsuranceApply::getEditor, applyChange.getEditor())
- .set(InsuranceApply::getEditDate, applyChange.getEditDate())
- .eq(InsuranceApply::getId, applyChange.getApplyId())
- );
- applyChange.setFee(bigDecimalVO.getTotalFee());
- }
-
+ //濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
+ insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
+ .setSql(bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0," fee = ifnull(fee,0)+" + bigDecimalVO.getTotalFee())
+ .setSql(bigDecimalVO.getCurrentFee().compareTo(new BigDecimal(0)) != 0," current_fee = ifnull(current_fee,0)+" + bigDecimalVO.getCurrentFee())
+ .set(InsuranceApply::getEditor, applyChange.getEditor())
+ .set(InsuranceApply::getEditDate, applyChange.getEditDate())
+ .eq(InsuranceApply::getId, applyChange.getApplyId())
+ );
+ applyChange.setFee(bigDecimalVO.getTotalFee());
}
@@ -828,7 +871,7 @@
* @param applyChange
* @param detail
*/
- public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail
+ public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
, BigDecimalVO bigDecimalVO){
//鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
@@ -840,26 +883,24 @@
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
- //鎬诲ぉ鏁�
- Integer countDays = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(detail.getEndTime(), 2),0);
-
//鍔犱繚
ApplyDetail add = new ApplyDetail();
- if(new Date().compareTo(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))>=0){
- Integer days = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0);
+ BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
+ solutions.getPrice():
+ solutions.getPrice().add(insuranceApply.getServerCost());
-
-
- //濡傛灉宸插凡浜х敓璐圭敤锛岃绠楀凡宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(new BigDecimal(days).multiply(detail.getPrice()));
+ add.setFee(Constants.addFee
+ (solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),applyChange.getApplyStartTime(),insuranceApply.getEndTime()));
+ if(new Date().compareTo(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))>=0){
+ add.setCurrentFee(
+ Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getEndTime(),DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))
+ );
}else{
add.setCurrentFee(BigDecimal.ZERO);
}
-
add.setPrice(detail.getPrice());
add.setApplyId(applyChange.getApplyId());
add.setValidCode(applyChange.getValidCode());
- add.setFee(detail.getFee());
add.setIsdeleted(Constants.ZERO);
add.setCreator(applyChange.getEditor());
add.setCreateDate(applyChange.getEditDate());
@@ -873,7 +914,8 @@
add.setDuId(detail.getDuId());
add.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1));
add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
- add.setFee(new BigDecimal(countDays).multiply(detail.getPrice()));
+ add.setRemark(detail.getRemark());
+ add.setUnionApplyId(insuranceApply.getUnionApplyId());
applyDetailJoinMapper.insert(add);
detail.setFee(add.getFee());
@@ -901,6 +943,9 @@
.eq(Member::getId, memberInsurance.getMemberId())
);
+// if(1==1){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+// }
}
/**
@@ -908,59 +953,62 @@
* @param applyChange
* @param detail
*/
- public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,BigDecimalVO bigDecimalVO){
+ public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,InsuranceApply insuranceApply,Solutions solutions
+ ,BigDecimalVO bigDecimalVO){
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
.eq(ApplyDetail::getMemberId, detail.getMemberId())
.orderByDesc(ApplyDetail::getCreateDate)
.last("limit 1"));
- if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getApplyStartTime().getTime()) {
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝師淇濆崟淇℃伅鏈夎锛屽綋鍓嶇敵璇蜂笉鏀寔鍑忎繚澶勭悊锛�");
+ if (oldModel == null || oldModel.getStartTime() == null || oldModel.getStartTime().getTime() > applyChange.getDelValidTime().getTime()) {
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鐢ㄦ埛銆�" + detail.getMemberName() + "銆戝綋鍓嶆壒鍑忔棩鏈熶笉鏀寔鍑忎繚鎿嶄綔锛�");
}
- //璁＄畻宸茬敓鏁堝ぉ鏁�
- //褰撳鎵规椂闂� 灏忎簬 褰撳墠鏃堕棿 璁＄畻瀹為檯鍑忓皯閲戦 鍥犱负宸叉墸閲戦浼氬ぇ浜� 搴旀墸閲戦
+ if(oldModel.getStartTime().getTime()>applyChange.getDelValidTime().getTime()||oldModel.getEndTime().getTime()<applyChange.getDelValidTime().getTime()){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鎵瑰噺鏃ユ湡鏈湪鐢ㄦ埛銆�" + detail.getMemberName() + "銆戠殑淇濆崟鏃ユ湡鍐咃紒");
+ }
+ BigDecimal fee = Objects.isNull(insuranceApply.getServerCost())?
+ solutions.getPrice():
+ solutions.getPrice().add(insuranceApply.getServerCost());
+
+ Date reduceDate = oldModel.getStartTime().compareTo(applyChange.getDelValidTime())!=0?
+ DateUtil.getMontageDate(applyChange.getDelValidTime(), 3):
+ DateUtil.getMontageDate(applyChange.getDelValidTime(), 2);
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ BigDecimal reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
BigDecimal pullFee = BigDecimal.ZERO;
- //鍑忎繚鍑忓皯鐨勯噾棰�
- BigDecimal reduceFee = BigDecimal.ZERO;
- Date reduceDate = DateUtil.getMontageDate(applyChange.getApplyStartTime(),3);
- if (reduceDate.getTime() < DateUtil.getMontageDate(new Date(), 2).getTime()) {
- //璁＄畻澶氭墸閲戦
- Integer days = DateUtil.calculateBetween(reduceDate,DateUtil.getMontageDate(new Date(), 2),0);
- pullFee = new BigDecimal(days).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
+ if (DateUtil.getMontageDate(new Date(), 2).getTime()>oldModel.getStartTime().getTime()) {
+ //// 2024骞�5鏈�8鏃�17:37:23 淇敼 璁＄畻浜х敓璐圭敤
+ pullFee = Constants.produceFee(solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime());
+ if(pullFee.compareTo(reduceFee)>0){
+ pullFee = reduceFee;
+ }
}
- //璁＄畻鎶曚繚鏄庣粏搴斿噺灏戠殑澶╂暟
- Integer reduceDays = DateUtil.daysBetweenDates(oldModel.getEndTime(),reduceDate);
- if(reduceDays>0){
- reduceFee = new BigDecimal(reduceDays).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
- }
+
+ bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee).subtract(oldModel.getFee()));
+ bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee).subtract(oldModel.getCurrentFee()));
+
applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + reduceFee)
- .setSql(" current_fee = ifnull(current_fee,0)+" + pullFee)
- .set(oldModel.getStartTime().compareTo(reduceDate)!=0,ApplyDetail::getEndTime, reduceDate)
- .set(oldModel.getStartTime().compareTo(reduceDate)==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+ .setSql(" fee = " + reduceFee)
+ .setSql(" current_fee = " + pullFee)
+ .set(ApplyDetail::getEndTime, reduceDate)
.set(ApplyDetail::getEditor, applyChange.getEditor())
.set(ApplyDetail::getEditDate, applyChange.getEditDate())
.eq(ApplyDetail::getId, oldModel.getId())
);
- bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee));
- bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee));
-
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + reduceFee)
- .set(oldModel.getStartTime().compareTo(reduceDate)!=0,MemberInsurance::getEndTime,reduceDate)
- .set(oldModel.getStartTime().compareTo(reduceDate)==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+ .setSql(" fee = " + reduceFee)
+ .set(MemberInsurance::getEndTime,reduceDate)
.eq(MemberInsurance::getRelationId, oldModel.getId())
);
-
memberMapper.update(null,new UpdateWrapper<Member>()
.lambda()
.set(Member::getStartTime,oldModel.getStartTime())
- .set(oldModel.getStartTime().compareTo(reduceDate)!=0,Member::getEndTime,reduceDate)
- .set(oldModel.getStartTime().compareTo(reduceDate)==0,Member::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+ .set(Member::getEndTime,reduceDate)
.set(Member::getDuId,oldModel.getDuId())
.set(Member::getWorktypeId,oldModel.getWorktypeId())
.eq(Member::getId, oldModel.getMemberId())
@@ -969,13 +1017,13 @@
//淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
// .setSql(" fee = ifnull(fee,0)+" + reduceFee)
- .set(ApplyChagneDetail::getFee,reduceFee)
+ .set(ApplyChagneDetail::getFee,reduceFee.subtract(oldModel.getFee()))
.set(ApplyChagneDetail::getEndTime,reduceDate)
.eq(ApplyChagneDetail::getId,detail.getId())
);
}
- public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail){
+ public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,InsuranceApply insuranceApply){
//瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
//鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
@@ -1000,86 +1048,128 @@
if(oldModel == null ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛銆�"+detail.getMemberName()+"銆戝師淇濆崟淇℃伅鏈夎锛屾壒鍗曟棩鏈熸湭鍦ㄤ繚鍗曟棩鏈熷唴锛�");
}
- //濡傛灉瀹為檯鎵瑰崟鏃ユ湡 鍜� 鍘熻褰曟棩鏈熺浉绛� 鍒欑洿鎺ヤ慨鏀硅褰曟淳閬ｅ崟浣嶄笌宸ョ淇℃伅
- if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
- //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
- Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(applyStartTime,2))>0;
- //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
- Integer days = DateUtil.calculateBetween(DateUtil.getMontageDate(applyStartTime,3),DateUtil.getMontageDate(oldModel.getStartTime(),1),0);
- BigDecimal oldFee = new BigDecimal(days).multiply(detail.getPrice());
- BigDecimal fee = oldModel.getFee();
- BigDecimal oldCurrentFee = oldModel.getCurrentFee();
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .set(ApplyDetail::getEditor,applyChange.getEditor())
- .set(ApplyDetail::getEditDate,applyChange.getEditDate())
- .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
- .set(ApplyDetail::getFee,oldFee)
- .set(flag,ApplyDetail::getCurrentFee,oldFee)
- .eq(ApplyDetail::getId,oldModel.getId())
- );
+ MemberInsurance memberInsurance = new MemberInsurance(detail,applyChange,applyChange.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(applyChange.getValidCode());
+ memberInsurance.setBdCode(insuranceApply.getCode());
+ memberInsurance.setRelationType(Constants.ONE);
+ memberInsurance.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(),1));
+ memberInsurance.setEndTime(oldModel.getEndTime());
- //淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
- memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
- .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyStartTime,3))
- .set(MemberInsurance::getFee,oldFee)
- .eq(MemberInsurance::getRelationId,oldModel.getId())
- );
+ applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+ .set(ApplyDetail::getEditor,applyChange.getEditor())
+ .set(ApplyDetail::getEditDate,applyChange.getEditDate())
+ .set(ApplyDetail::getDuId,detail.getDuId())
+ .set(ApplyDetail::getWorktypeId,detail.getWorktypeId())
+ .eq(ApplyDetail::getId,oldModel.getId())
+ );
- ApplyDetail add = new ApplyDetail();
- add.setApplyId(oldModel.getApplyId());
- add.setCreateDate(new Date());
- add.setCreator(applyChange.getEditor());
- add.setMemberId(oldModel.getMemberId());
- add.setIdcardNo(detail.getIdcardNo());
- add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
- add.setMemberName(detail.getMemberName());
- add.setStartTime(DateUtil.getMontageDate(applyStartTime,1));
- add.setEndTime(oldModel.getEndTime());
- add.setDuId(detail.getDuId());
- add.setWorktypeId(detail.getWorktypeId());
- add.setIdcardNo(oldModel.getIdcardNo());
- add.setFee(fee.subtract(oldFee));
- add.setIsdeleted(Constants.ZERO);
- if(flag){
- add.setCurrentFee(oldCurrentFee.multiply(oldFee));
- }else{
- add.setCurrentFee(BigDecimal.ZERO);
- }
- add.setSex(oldModel.getSex());
- add.setMemberName(oldModel.getMemberName());
- add.setFromId(detail.getId());
- applyDetailJoinMapper.insert(add);
+// memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+// .set(MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(),3))
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+// );
- MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
- memberInsurance.setSolutionId(detail.getSolutionId());
- memberInsurance.setWorktypeName(detail.getWorkTypeName());
- memberInsurance.setDuName(detail.getDuName());
- memberInsurance.setApplyChangeId(detail.getApplyChangeId());
- memberInsurance.setSolutionName(detail.getSolutionsName());
- memberInsurance.setPdCode(applyChange.getValidCode());
- memberInsurance.setBdCode(applyChange.getApplyCode());
- memberInsurance.setRelationType(Constants.ONE);
- memberInsuranceJoinMapper.insert(memberInsurance);
+ memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>().lambda()
+ .eq(MemberInsurance::getApplyId,applyChange.getApplyId())
+ .eq(MemberInsurance::getMemberId,detail.getMemberId())
+ .le(MemberInsurance::getStartTime,applyStartTime)
+ .ge(MemberInsurance::getEndTime,applyStartTime)
+ .set(insuranceApply.getStartTime().compareTo(applyChange.getApplyStartTime())!=0,
+ MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 3))
+ .set(insuranceApply.getStartTime().compareTo(applyChange.getApplyStartTime())==0,
+ MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+// .ne(MemberInsurance::getId,memberInsurance.getId())
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+ );
- }else{
- applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
- .set(ApplyDetail::getEditor,applyChange.getEditor())
- .set(ApplyDetail::getEditDate,applyChange.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())
- );
+ memberInsuranceJoinMapper.insert(memberInsurance);
- }
+
+// //濡傛灉瀹為檯鎵瑰崟鏃ユ湡 鍜� 鍘熻褰曟棩鏈熺浉绛� 鍒欑洿鎺ヤ慨鏀硅褰曟淳閬ｅ崟浣嶄笌宸ョ淇℃伅
+// if(applyStartTime.compareTo(oldModel.getStartTime())!=Constants.ZERO){
+// //褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
+// Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(applyStartTime,2))>0;
+// //鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
+// Integer days = DateUtil.calculateBetween(DateUtil.getMontageDate(applyStartTime,3),DateUtil.getMontageDate(oldModel.getStartTime(),1),0);
+// BigDecimal oldFee = new BigDecimal(days).multiply(detail.getPrice());
+// BigDecimal fee = oldModel.getFee();
+// BigDecimal oldCurrentFee = oldModel.getCurrentFee();
+//
+// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+// .set(ApplyDetail::getEditor,applyChange.getEditor())
+// .set(ApplyDetail::getEditDate,applyChange.getEditDate())
+// .set(ApplyDetail::getEndTime,DateUtil.getMontageDate(applyStartTime,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,DateUtil.getMontageDate(applyStartTime,3))
+// .set(MemberInsurance::getFee,oldFee)
+// .eq(MemberInsurance::getRelationId,oldModel.getId())
+// );
+//
+// ApplyDetail add = new ApplyDetail();
+// add.setApplyId(oldModel.getApplyId());
+// add.setCreateDate(new Date());
+// add.setCreator(applyChange.getEditor());
+// add.setMemberId(oldModel.getMemberId());
+// add.setIdcardNo(detail.getIdcardNo());
+// add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
+// add.setMemberName(detail.getMemberName());
+// add.setStartTime(DateUtil.getMontageDate(applyStartTime,1));
+// add.setEndTime(oldModel.getEndTime());
+// add.setDuId(detail.getDuId());
+// add.setWorktypeId(detail.getWorktypeId());
+// add.setIdcardNo(oldModel.getIdcardNo());
+// add.setFee(fee.subtract(oldFee));
+// add.setIsdeleted(Constants.ZERO);
+// if(flag){
+// add.setCurrentFee(oldCurrentFee.multiply(oldFee));
+// }else{
+// add.setCurrentFee(BigDecimal.ZERO);
+// }
+// add.setSex(oldModel.getSex());
+// add.setMemberName(oldModel.getMemberName());
+// add.setFromId(detail.getId());
+// applyDetailJoinMapper.insert(add);
+//
+// MemberInsurance memberInsurance = new MemberInsurance(add,applyChange.getId());
+// memberInsurance.setSolutionId(detail.getSolutionId());
+// memberInsurance.setWorktypeName(detail.getWorkTypeName());
+// memberInsurance.setDuName(detail.getDuName());
+// memberInsurance.setApplyChangeId(detail.getApplyChangeId());
+// memberInsurance.setSolutionName(detail.getSolutionsName());
+// memberInsurance.setPdCode(applyChange.getValidCode());
+// memberInsurance.setBdCode(applyChange.getApplyCode());
+// memberInsurance.setRelationType(Constants.ONE);
+// memberInsuranceJoinMapper.insert(memberInsurance);
+//
+// }else{
+// applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
+// .set(ApplyDetail::getEditor,applyChange.getEditor())
+// .set(ApplyDetail::getEditDate,applyChange.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)){
--
Gitblit v1.9.3