From 9333d15ca58cb0ddd8340deb7668aa7d1faad776 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 19:03:45 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 25 +++++-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 1
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 15 +++
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 122 +++++++++++++++++++++++-------
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 4 +
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 35 ++++++++
6 files changed, 163 insertions(+), 39 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index ada7385..f6929c8 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -819,6 +819,7 @@
CA_HBD_SIGNATURE_TBD(38, "鍟嗘埛绛剧珷","",4),
CA_HBD_UPLOAD_INSURANCE(39, "鎶曚繚瀹屾垚","",4),
CA_HBD_CLOSE(40, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",4),
+ CA_HBD_AUDIT(41, "瀹℃壒閫氳繃","鍘熷洜锛�${param}",4),
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 3dec0e7..65b1e31 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -135,6 +135,10 @@
@ExcelColumn(name="鎬昏垂鐢�")
private BigDecimal fee;
+ @ApiModelProperty(value = "鏈嶅姟璐�")
+ @ExcelColumn(name="鏈嶅姟璐�")
+ private BigDecimal serverCost;
+
@ApiModelProperty(value = "鍦ㄧ嚎纭涔﹀悎鍚屽彿")
@ExcelColumn(name="鍦ㄧ嚎纭涔﹀悎鍚屽彿")
private String signQrsNo;
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 75cef66..02f12dd 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
@@ -320,7 +320,7 @@
}
/**
- * 澶勭悊鍔犲噺淇濇槑缁嗘暟鎹�
+ * 澶勭悊鎹㈠巶鏄庣粏鏁版嵁
* @param update
*/
private void dealDetailsDUdata(ApplyChange update,InsuranceApply insuranceApply) {
@@ -351,7 +351,6 @@
//瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
Date applyStartTime = DateUtil.getMontageDate(update.getApplyStartTime(),1);
for(ApplyChagneDetail detail : detailList){
- //鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
.eq(ApplyDetail::getApplyId,update.getApplyId())
@@ -1010,7 +1009,8 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ紒涓氬垎閰嶄繚闄╂柟妗堟棤娉曡繘琛屽噺淇�");
}
//鍑忎繚鏄庣粏鏁版嵁 璁＄畻閲戦 鏍规嵁鎵瑰崟鏃堕棿 鍓嶄竴澶� 璁＄畻
- applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),2));
+ applyChangeCyclePriceDTO.setValidTime(DateUtil.getMontageDate(applyChange.getValidTime(),3));
+
CountCyclePriceVO countCyclePriceVO = this.getChangeCountCyclePriceVO(applyChangeCyclePriceDTO);
BigDecimal detailFee = countCyclePriceVO.getCyclePrice();
this.delChangeDetail(applyChange,delDetailList,insuranceApply,solutions,loginUserInfo,detailFee,applyChangeCyclePriceDTO.getValidTime());
@@ -1097,6 +1097,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鍑忎繚浜哄憳銆�" + applyChagneDetail.getMemberName() + "銆戜繚鍗曚繚闅滄棩鏈熻嚦锛氥��" + applyDetail.getEndTime() + "銆戞棤娉曢�氳繃鏈鐢宠");
}
+
applyChagneDetail.setPrice(applyDetail.getPrice());
applyChagneDetail.setCreateDate(new Date());
applyChagneDetail.setCreator(loginUserInfo.getId());
@@ -1114,7 +1115,10 @@
member.setEndTime(applyChagneDetail.getEndTime());
memberMapper.updateById(member);
- applyChagneDetail.setFee( detailFee.multiply(new BigDecimal(-1)));
+ //鏌ヨ鍑忎繚鏃ユ湡
+ Integer delDays = DateUtil.daysBetweenDates(applyDetail.getEndTime(),endTime);
+
+ applyChagneDetail.setFee( new BigDecimal(delDays).multiply(applyDetail.getPrice()).multiply(new BigDecimal(-1)));
applyChagneDetailJoinMapper.insert(applyChagneDetail);
}
}
@@ -2206,6 +2210,19 @@
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(applyChange,applyLogType.getName(),info,applyChange.getId(),applyLogType.getKey(), null, null);
+ applyLogMapper.insert(log);
+
+
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.APPLY_CHANGE;
if(Constants.equalsInteger(applyChange.getType(),Constants.ONE)){
noticeObjectType = Constants.NoticeObjectType.CHANGE_FACTORY;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index aa71dd7..4caeb81 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -295,6 +295,16 @@
MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
memberInsurance.setRelationType(Constants.ZERO);
memberInsuranceList.add(memberInsurance);
+
+ memberMapper.update(null,new UpdateWrapper<Member>()
+ .lambda()
+ .set(Member::getStartTime,memberInsurance.getStartTime())
+ .set(Member::getEndTime,memberInsurance.getEndTime())
+ .set(Member::getDuId,memberInsurance.getDuId())
+ .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
+ .eq(Member::getId, memberInsurance.getMemberId())
+ );
+
}
memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
}
@@ -1539,7 +1549,7 @@
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"淇濆崟鐢熸晥璧锋湡閿欒");
}
}else{
- if(DateUtil.getNextMonthFirst(new Date()).getTime()>insuranceApply.getApplyStartTime().getTime()){
+ if(DateUtil.getMontageDate(DateUtil.getNextMonthFirst(new Date()),1).getTime()>insuranceApply.getApplyStartTime().getTime()){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"淇濆崟鐢熸晥璧锋湡閿欒");
}
}
@@ -2237,7 +2247,8 @@
private void setServiceDays(InsuranceApply insuranceApply) {
//璁剧疆鍦ㄤ繚鏃堕暱锛堝ぉ鏁帮級
insuranceApply.setServiceDays(Constants.ZERO);
- if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+ if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
//濡傛灉褰撳墠鏃堕棿澶т簬缁撴潫鏃ユ湡 鍒欎娇鐢ㄧ粨鏉熸棩鏈熷姣斿紑濮嬫棩鏈�
if(DateUtil.compareDate(new Date(),insuranceApply.getEndTime())>=Constants.ZERO){
insuranceApply.setServiceDays(
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index a2e652a..90eb09a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -80,6 +80,8 @@
@Autowired
private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
+ @Autowired
+ private MemberMapper memberMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -735,8 +737,20 @@
List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();
//鎵�鏈夋姇淇濈敵璇蜂繚鍗曟槑缁嗚
- List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
- .select(ApplyDetail::getId,ApplyDetail::getApplyId,ApplyDetail::getPrice)
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,new MPJLambdaWrapper<ApplyDetail>()
+ .selectAll(ApplyDetail.class)
+ .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
+ .selectAs(InsuranceApply::getCode,ApplyDetail::getApplyCode)
+ .selectAs(Solutions::getId,ApplyDetail::getSolutionId)
+ .selectAs(Solutions::getName,ApplyDetail::getSolutionName)
+ .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
+ .selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo)
+ .selectAs(Member::getName,ApplyDetail::getMemberName)
+ .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
+ .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
+ .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
+ .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.in(ApplyDetail::getUnionApplyId,unionApply.getId()));
unionApplyBXDDTO.setEndTime(DateUtil.getMontageDate(unionApplyBXDDTO.getEndTime(),2));
//鎬诲ぉ鏁�
@@ -764,9 +778,10 @@
Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
+ BigDecimal serverCost = BigDecimal.ZERO;
if(unionApplyBXDDDetailTO.isPresent()){
UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
-
+ serverCost = unionApplyBXDDetailDTO.getServerMoney();
BigDecimal dayServerMoney = unionApplyBXDDetailDTO.getServerMoney().divide(new BigDecimal(maxDays),2, RoundingMode.HALF_UP);
price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(dayServerMoney));
@@ -801,9 +816,22 @@
.filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList())) {
applyDetail.setPrice(price);
applyDetail.setFee(price.multiply(new BigDecimal(maxDays)));
+ applyDetail.setStartTime(unionApplyBXDDTO.getStartTime());
+ applyDetail.setEndTime(unionApplyBXDDTO.getEndTime());
MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
+ memberInsurance.setBdCode(unionApplyBXDDTO.getCode());
memberInsurance.setRelationType(Constants.ZERO);
memberInsuranceList.add(memberInsurance);
+ //鏇存柊鍛樺伐鎶曚繚鏃堕棿
+ memberMapper.update(null,new UpdateWrapper<Member>()
+ .lambda()
+ .set(Member::getStartTime,memberInsurance.getStartTime())
+ .set(Member::getEndTime,memberInsurance.getEndTime())
+ .set(Member::getDuId,memberInsurance.getDuId())
+ .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
+ .eq(Member::getId, memberInsurance.getMemberId())
+ );
+
}
memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
}
@@ -818,6 +846,7 @@
.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
.set(InsuranceApply::getEditDate,new Date())
.set(InsuranceApply::getEditor,user.getId())
+ .set(InsuranceApply::getServerCost,serverCost)
.set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
.eq(InsuranceApply::getId,insuranceApply.getId()));
//鏇存柊鎶曚繚鍗曟槑缁嗛噾棰�
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 3cc038d..a05336f 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
@@ -178,10 +178,13 @@
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()));
+ fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice())).add(applyChagneDetail.getFee());
}
}
unionChange.setFee(fee);
@@ -355,11 +358,16 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-// UnionApply unionApply = unionApplyMapper.selectById(saveUnionChangeDTO.getUnionApplyId());
-// if(Objects.isNull(unionApply)){
-// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟鏁版嵁");
-// }
-
+ UnionApply unionApply = unionApplyMapper.selectById(saveUnionChangeDTO.getUnionApplyId());
+ if(Objects.isNull(unionApply)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟鏁版嵁");
+ }
+ //鍒ゆ柇鎵瑰崟鏃ユ湡 鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熷湪涓� 淇濆崟璧锋湡鐨勬鏃� 鍒颁繚鍗曟鏈�
+ //鑾峰彇寮�濮嬫棩鏈熸鏃�
+ if(saveUnionChangeDTO.getApplyDate().getTime()<=DateUtil.afterDateByType(unionApply.getStartTime(),0,1).getTime()
+ || saveUnionChangeDTO.getApplyDate().getTime()> unionApply.getEndTime().getTime()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熼敊璇�");
+ }
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -631,6 +639,16 @@
if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
}
+ UnionApply unionApply = unionApplyMapper.selectById(unionChange.getUnionApplyId());
+ 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(),"鍚堝苟鍗曠殑鎵瑰崟鐢熸晥鏈熼敊璇�");
+ }
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
@@ -686,15 +704,28 @@
applyChange.setEditDate(new Date());
applyChange.setEditor(user.getId());
applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
+ applyChange.setCode(unionChangeBXDDTO.getCode());
+ applyChange.setValidCode(unionChangeBXDDTO.getCode());
+ applyChange.setCheckUserId(user.getId());
List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectJoinList(ApplyChagneDetail.class,
- new MPJLambdaWrapper<ApplyChagneDetail>().selectAll(ApplyChagneDetail.class)
- .selectAs(Member::getName,ApplyChagneDetail::getMemberName )
- .selectAs(Member::getIdcardNo,ApplyChagneDetail::getIdcardNo )
- .leftJoin(Member.class,Member::getId,ApplyChagneDetail::getMemberId)
+ 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,applyChange.getId()));
this.dealApplyChangeDetail(applyChange,allList);
- applyChange.setCode(unionChangeBXDDTO.getCode());
- applyChange.setCheckUserId(user.getId());
applyChangeJoinMapper.updateById(applyChange);
}
}
@@ -714,6 +745,9 @@
,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
applyLogMapper.insert(log);
+// if(true){
+// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+// }
}
@@ -747,12 +781,6 @@
.set(InsuranceApply::getEditDate, applyChange.getEditDate())
.eq(InsuranceApply::getId, applyChange.getApplyId())
);
-// applyChangeJoinMapper.update(null, new UpdateWrapper<ApplyChange>().lambda()
-// .set(ApplyChange::getFee,bigDecimalVO.getTotalFee())
-// .set(ApplyChange::getEditor, applyChange.getEditor())
-// .set(ApplyChange::getEditDate, applyChange.getEditDate())
-// .eq(ApplyChange::getId, applyChange.getApplyId())
-// );
applyChange.setFee(bigDecimalVO.getTotalFee());
}
@@ -788,6 +816,8 @@
}else{
add.setCurrentFee(BigDecimal.ZERO);
}
+
+ add.setPrice(detail.getPrice());
add.setApplyId(applyChange.getApplyId());
add.setValidCode(applyChange.getValidCode());
add.setFee(detail.getFee());
@@ -820,7 +850,18 @@
memberInsurance.setStartTime(add.getStartTime());
memberInsurance.setEndTime(add.getEndTime());
memberInsurance.setRelationType(Constants.ONE);
+ memberInsurance.setPdCode(applyChange.getValidCode());
memberInsuranceJoinMapper.insert(memberInsurance);
+
+ memberMapper.update(null,new UpdateWrapper<Member>()
+ .lambda()
+ .set(Member::getStartTime,memberInsurance.getStartTime())
+ .set(Member::getEndTime,memberInsurance.getEndTime())
+ .set(Member::getDuId,memberInsurance.getDuId())
+ .set(Member::getWorktypeId,memberInsurance.getWorktypeId())
+ .eq(Member::getId, memberInsurance.getMemberId())
+ );
+
}
/**
@@ -843,22 +884,22 @@
BigDecimal pullFee = BigDecimal.ZERO;
//鍑忎繚鍑忓皯鐨勯噾棰�
BigDecimal reduceFee = BigDecimal.ZERO;
- if (DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0) > 0) {
+ Date reduceDate = DateUtil.getMontageDate(applyChange.getApplyStartTime(),3);
+ if (reduceDate.getTime() < DateUtil.getMontageDate(new Date(), 2).getTime()) {
//璁＄畻澶氭墸閲戦
-
- Integer days = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0);
+ Integer days = DateUtil.calculateBetween(reduceDate,DateUtil.getMontageDate(new Date(), 2),0);
pullFee = new BigDecimal(days).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
}
//璁＄畻鎶曚繚鏄庣粏搴斿噺灏戠殑澶╂暟
- Integer reduceDays = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(oldModel.getEndTime(), 2),0);
+ Integer reduceDays = DateUtil.daysBetweenDates(oldModel.getEndTime(),reduceDate);
if(reduceDays>0){
reduceFee = new BigDecimal(reduceDays).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
}
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(applyChange.getApplyStartTime())!=0,ApplyDetail::getEndTime, DateUtil.getMontageDate(applyChange.getApplyStartTime(), 3))
- .set(oldModel.getStartTime().compareTo(applyChange.getApplyStartTime())==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+ .set(oldModel.getStartTime().compareTo(reduceDate)!=0,ApplyDetail::getEndTime, reduceDate)
+ .set(oldModel.getStartTime().compareTo(reduceDate)==0,ApplyDetail::getEndTime, DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
.set(ApplyDetail::getEditor, applyChange.getEditor())
.set(ApplyDetail::getEditDate, applyChange.getEditDate())
.eq(ApplyDetail::getId, oldModel.getId())
@@ -870,24 +911,34 @@
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
.setSql(" fee = ifnull(fee,0)+" + reduceFee)
- .set(oldModel.getStartTime().compareTo(applyChange.getApplyStartTime())!=0,MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 3))
- .set(oldModel.getStartTime().compareTo(applyChange.getApplyStartTime())==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
+ .set(oldModel.getStartTime().compareTo(reduceDate)!=0,MemberInsurance::getEndTime,reduceDate)
+ .set(oldModel.getStartTime().compareTo(reduceDate)==0,MemberInsurance::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 2))
.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::getDuId,oldModel.getDuId())
+ .set(Member::getWorktypeId,oldModel.getWorktypeId())
+ .eq(Member::getId, oldModel.getMemberId())
);
//淇敼涓氬姟鏄庣粏琛屾暟鎹疄闄呮壒鍗曟棩鏈�
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + reduceFee)
- .set(ApplyChagneDetail::getEndTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 3))
+// .setSql(" fee = ifnull(fee,0)+" + reduceFee)
+ .set(ApplyChagneDetail::getFee,reduceFee)
+ .set(ApplyChagneDetail::getEndTime,reduceDate)
.eq(ApplyChagneDetail::getId,detail.getId())
);
}
public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail){
-
//瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
-
//鏌ヨ鍑忎繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
@@ -991,6 +1042,17 @@
}
+ Member member = memberMapper.selectById(detail.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鍛樺伐鏁版嵁");
+ }
+ member.setApplyId(applyChange.getApplyId());
+ member.setDuId(detail.getDuId());
+ member.setWorktypeId(detail.getWorktypeId());
+ member.setStartTime(detail.getStartTime());
+ member.setEndTime(detail.getEndTime());
+ memberMapper.updateById(member);
+
--
Gitblit v1.9.3