From 3fee8832ca52667b26f702255677d62775ce5cd6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 19:06:40 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 213 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 138 insertions(+), 75 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 59baf20..3cc038d 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;
@@ -17,6 +18,7 @@
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.CountCyclePriceVO;
import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.vo.BigDecimalVO;
import com.doumee.service.business.SmsEmailService;
import com.doumee.service.business.UnionChangeService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,6 +58,9 @@
@Autowired
private ApplyChangeJoinMapper applyChangeJoinMapper;
+
+ @Autowired
+ private UnionApplyMapper unionApplyMapper;
@Autowired
private ApplyChagneDetailJoinMapper applyChagneDetailJoinMapper;
@@ -163,6 +168,23 @@
);
if(!Objects.isNull(unionChange)){
+ //鏌ヨ鍔犲噺淇濇槑缁嗘暟鎹�
+ List<ApplyChagneDetail> applyChangeList = applyChagneDetailJoinMapper
+ .selectList(new QueryWrapper<ApplyChagneDetail>()
+ .lambda()
+ .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.ZERO)){
+ fee = fee.add(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
+ }else{
+ fee = fee.subtract(new BigDecimal(maxDays).multiply(applyChagneDetail.getPrice()));
+ }
+ }
+ unionChange.setFee(fee);
//鏌ヨ鎿嶄綔璁板綍
List<ApplyLog> applyLogList = applyLogJoinMapper.selectJoinList(ApplyLog.class,
new MPJLambdaWrapper<ApplyLog>()
@@ -172,15 +194,40 @@
.selectAs(SystemUser::getType,ApplyLog::getCreatorType)
.leftJoin(SystemUser.class,SystemUser::getId,ApplyLog::getCreator)
.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
- .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.THREE))
+ .in(ApplyLog::getObjType,Constants.ApplyLogType.getTypeList(Constants.FOUR))
.eq(ApplyLog::getApplyId,unionChange.getId())
.orderByAsc(ApplyLog::getCreateDate)
);
unionChange.setApplyLogList(applyLogList);
}
+ initFiles(unionChange);
return unionChange;
}
+ private void initFiles(UnionChange unionChange) {
+ List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, unionChange.getId() )
+ .in(Multifile::getObjType, Arrays.asList(new Integer[]{Constants.MultiFile.WTB_CA_TBD_PDF.getKey(),Constants.MultiFile.WTB_CA_DONE_PDF.getKey()}))
+ .eq(Multifile::getIsdeleted,Constants.ZERO));
+ if(multifiles!=null){
+ String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.OSS,Constants.APPLY_FILE).getCode();
+ for(Multifile f : multifiles){
+ if(StringUtils.isBlank(f.getFileurl())){
+ continue;
+ }
+ f.setFileurlFull(path+f.getFileurl());
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_CA_TBD_PDF.getKey())){
+ //绛剧讲鍚庣敵璇峰崟
+ unionChange.setApplyFile(f);
+ }
+ if(Constants.equalsInteger(f.getObjType(),Constants.MultiFile.WTB_CA_DONE_PDF.getKey())){
+ //绛剧讲鍚庣敵璇峰崟
+ unionChange.setPidanFile(f);
+ }
+ }
+ }
+ }
@Override
@@ -200,6 +247,7 @@
IPage<UnionChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<UnionChange> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(UnionChange.class);
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
queryWrapper.selectAs(UnionApply::getCode,UnionChange::getApplyCode);
queryWrapper.selectAs(Solutions::getName,UnionChange::getSolutionsName)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0 )",UnionChange::getAddNum)
@@ -209,7 +257,7 @@
queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
- queryWrapper.eq(UnionChange::getShopId, pageWrap.getModel().getShopId());
+ queryWrapper.eq(UnionChange::getShopId, user.getCompanyId());
}
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
@@ -292,6 +340,7 @@
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer merge(SaveUnionChangeDTO saveUnionChangeDTO){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!user.getType().equals(Constants.TWO)){
@@ -305,6 +354,13 @@
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+
+// UnionApply unionApply = unionApplyMapper.selectById(saveUnionChangeDTO.getUnionApplyId());
+// if(Objects.isNull(unionApply)){
+// throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鍚堝苟淇濆崟鏁版嵁");
+// }
+
+
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,
new MPJLambdaWrapper<ApplyChange>()
.selectAll(ApplyChange.class)
@@ -312,7 +368,7 @@
.eq(ApplyChange::getIsdeleted, Constants.ZERO)
.eq(InsuranceApply::getUnionApplyId,saveUnionChangeDTO.getUnionApplyId())
.eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey())
- .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
.eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType())
.in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds())
.isNull(ApplyChange::getUnionChangeId)
@@ -326,8 +382,9 @@
unionChange.setCreateDate(new Date());
unionChange.setCreator(user.getId());
unionChange.setShopId(user.getCompanyId());
+ unionChange.setIsdeleted(Constants.ZERO);
unionChange.setUnionApplyId(saveUnionChangeDTO.getUnionApplyId());
- unionChange.setApplyStartTime(saveUnionChangeDTO.getApplyDate());
+ unionChange.setApplyStartTime(DateUtil.getMontageDate(saveUnionChangeDTO.getApplyDate(),1));
unionChange.setType(saveUnionChangeDTO.getBusinessType());
unionChange.setStatus(Constants.UnionChangeStatus.MERGE.getKey());
unionChangeMapper.insert(unionChange);
@@ -342,7 +399,7 @@
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
.set(ApplyChagneDetail::getUnionChangeId,unionChange.getId())
- .in(ApplyChagneDetail::getApplyId,saveUnionChangeDTO.getApplyIds()));
+ .in(ApplyChagneDetail::getApplyChangeId,saveUnionChangeDTO.getApplyIds()));
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD;
@@ -371,13 +428,16 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(user.getType().equals(Constants.TWO)){
+ user.setType(Constants.formatIntegerNum(user.getType()));
+ if(!user.getType().equals(Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣滐紒");
}
UnionChange unionChange = unionChangeMapper.selectById(closeDTO.getId());
if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
+ unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
if(!unionChange.getShopId().equals(user.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
}
@@ -398,14 +458,14 @@
applyChagneDetailJoinMapper.update(null,new UpdateWrapper<ApplyChagneDetail>().lambda()
.set(ApplyChagneDetail::getUnionChangeId,null)
- .in(ApplyChagneDetail::getApplyId,unionChange.getId()));
+ .eq(ApplyChagneDetail::getUnionChangeId,unionChange.getId()));
unionChangeMapper.update(null,new UpdateWrapper<UnionChange>().lambda()
- .set(UnionChange::getStatus,Constants.UnionApplyStatus.CLOSE.getKey())
+ .set(UnionChange::getStatus,Constants.UnionChangeStatus.CLOSE.getKey())
.eq(UnionChange::getId,unionChange.getId())
);
- Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD;
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_CLOSE;
String info =applyLogType.getInfo();
info = info.replace("${param}", closeDTO.getReason());
ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), info
@@ -415,8 +475,11 @@
}
+ @Override
public UnionChange unionChangeDetail(Integer unionChangeId){
-
+ if(Objects.isNull(unionChangeId)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
UnionChange unionChange = unionChangeJoinMapper.selectJoinOne(UnionChange.class,
new MPJLambdaWrapper<UnionChange>()
.selectAll(UnionChange.class)
@@ -433,8 +496,10 @@
);
//浼佷笟鍚嶇О
List<ApplyChange> applyChangeList = applyChangeJoinMapper.selectJoinList(ApplyChange.class,new MPJLambdaWrapper<ApplyChange>()
+ .selectAll(ApplyChange.class)
.selectAs(Company::getName,ApplyChange::getCompanyName)
- .leftJoin(Company.class,Company::getId,ApplyChange::getCompanyId)
+ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId)
+ .leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(ApplyChange::getUnionChangeId,unionChangeId)
);
@@ -486,6 +551,7 @@
}
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
UnionChange unionChange = this.unionChangeDetail(smsCheckDTO.getBusinessId());
+ unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
@@ -498,7 +564,7 @@
if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡鍏抽棴");
}
- if(unionChange.getStatus().equals(Constants.UnionChangeStatus.MERGE.getKey())){
+ if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.MERGE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
}
Company company = companyMapper.selectById(user.getCompanyId());
@@ -551,6 +617,8 @@
if(Objects.isNull(unionChange)||!Constants.equalsInteger(unionChange.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ unionChange.setStatus(Constants.formatIntegerNum(unionChange.getStatus()));
+ unionChange.setShopId(Constants.formatIntegerNum(unionChange.getShopId()));
if(!unionChange.getShopId().equals(user.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
}
@@ -560,7 +628,7 @@
if(unionChange.getStatus().equals(Constants.UnionChangeStatus.CLOSE.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曚笟鍔″凡鍏抽棴");
}
- if(unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
+ if(!unionChange.getStatus().equals(Constants.UnionChangeStatus.UPLOAD_INSURANCE_POLICY.getKey())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆");
}
@@ -600,19 +668,17 @@
||StringUtils.isBlank(m.getFileurl())
||StringUtils.isBlank(m.getName())
){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍔犲噺淇�/鎹㈠巶涓氬姟鎵瑰崟鏂囦欢淇℃伅缂哄け");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鎵瑰崟鏂囦欢淇℃伅缂哄け");
}
- multifile.setIsdeleted(Constants.ZERO);
- multifile.setCreator(user.getId());
- multifile.setCreateDate(new Date());
- multifile.setCreateDate(new Date());
- multifile.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
- multifile.setType(Constants.TWO);
- multifileMapper.insert(multifile);
+ m.setId(null);
+ m.setIsdeleted(Constants.ZERO);
+ m.setCreator(user.getId());
+ m.setCreateDate(new Date());
+ m.setObjType(Constants.MultiFile.CA_PD_PDF.getKey());
+ m.setType(Constants.TWO);
+ multifileMapper.insert(m);
}
}
-
-
if(CollectionUtils.isNotEmpty(applyChangeList)){
for (ApplyChange applyChange:applyChangeList) {
applyChange.setApplyStartTime(unionChangeBXDDTO.getApplyDate());
@@ -620,7 +686,12 @@
applyChange.setEditDate(new Date());
applyChange.setEditor(user.getId());
applyChange.setStatus(Constants.ApplyChangeStatus.APPROVE.getKey());
- List<ApplyChagneDetail> allList = applyChagneDetailJoinMapper.selectList(new QueryWrapper<ApplyChagneDetail>().lambda().eq(ApplyChagneDetail::getApplyChangeId,applyChange.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)
+ .eq(ApplyChagneDetail::getApplyChangeId,applyChange.getId()));
this.dealApplyChangeDetail(applyChange,allList);
applyChange.setCode(unionChangeBXDDTO.getCode());
applyChange.setCheckUserId(user.getId());
@@ -631,6 +702,9 @@
.set(UnionChange::getStatus,Constants.UnionChangeStatus.FINISH.getKey())
.set(UnionChange::getEditDate,new Date())
.set(UnionChange::getEditor,user.getId())
+ .set(UnionChange::getValidTime,unionChangeBXDDTO.getApplyDate())
+ .set(UnionChange::getApplyStartTime,unionChangeBXDDTO.getApplyDate())
+ .set(UnionChange::getCode,unionChangeBXDDTO.getCode())
.eq(UnionChange::getId,unionChangeBXDDTO.getId())
);
@@ -639,6 +713,7 @@
ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null
,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange));
applyLogMapper.insert(log);
+
}
@@ -646,44 +721,39 @@
public void dealApplyChangeDetail(ApplyChange applyChange,List<ApplyChagneDetail> applyChagneDetailList){
- BigDecimal totalFee = BigDecimal.ZERO;
- BigDecimal currentFee = BigDecimal.ZERO;
- //鏌ヨ鏈�鍚庤褰� 鑾峰彇瀵瑰簲鍗曚环
- ApplyDetail applyDetail = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,applyChange.getApplyId()).last(" limit 1 "));
- if(Objects.isNull(applyDetail)){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌淇濆崟鏄庣粏鏁版嵁");
- }
- //鑾峰彇鍗曚环
- BigDecimal price = applyDetail.getPrice();
+ BigDecimalVO bigDecimalVO = new BigDecimalVO();
+ bigDecimalVO.setTotalFee(BigDecimal.ZERO);
+ bigDecimalVO.setCurrentFee(BigDecimal.ZERO);
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,price,currentFee,totalFee);
+ this.addChangeDetailData(applyChange,detail,bigDecimalVO);
}else if(Constants.equalsInteger(detail.getType(),Constants.ONE)){
- this.reduceChangeDetailData(applyChange,detail,applyDetail,price,currentFee,totalFee);
+ this.reduceChangeDetailData(applyChange,detail,bigDecimalVO);
}else{
- this.otherChangeDetailData(applyChange,detail,applyDetail,price);
+ this.otherChangeDetailData(applyChange,detail);
}
}
- if (totalFee.compareTo(new BigDecimal(0)) != 0) {
+ if (bigDecimalVO.getTotalFee().compareTo(new BigDecimal(0)) != 0) {
//濡傛灉淇濆崟閲戦鍙戠敓缂栫爜锛屾洿鏂版�讳繚鍗曢噾棰�
insuranceApplyMapper.update(null, new UpdateWrapper<InsuranceApply>().lambda()
- .setSql(" fee = ifnull(fee,0)+" + totalFee)
- .setSql(" current_fee = ifnull(current_fee,0)+" + currentFee)
+ .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())
);
- applyChangeJoinMapper.update(null, new UpdateWrapper<ApplyChange>().lambda()
- .set(ApplyChange::getFee,totalFee)
- .set(ApplyChange::getEditor, applyChange.getEditor())
- .set(ApplyChange::getEditDate, applyChange.getEditDate())
- .eq(ApplyChange::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());
}
}
@@ -693,12 +763,9 @@
* 鍔犱繚鏁版嵁澶勭悊
* @param applyChange
* @param detail
- * @param price
- * @param currentFee
- * @param totalFee
*/
- public void addChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail
- ,BigDecimal price,BigDecimal currentFee,BigDecimal totalFee){
+ public void addChangeDetailData(ApplyChange applyChange, ApplyChagneDetail detail
+ , BigDecimalVO bigDecimalVO){
//鏌ヨ鍔犱繚浜哄憳鏄惁瀛樺湪 鍐茬獊鐨� 淇濆崟鏄庣粏鏁版嵁
if(applyDetailJoinMapper.selectCount(new QueryWrapper<ApplyDetail>()
.lambda()
@@ -710,13 +777,14 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍔犱繚浜哄憳銆�" + detail.getMemberName() + "銆戝瓨鍦ㄦ棩鏈熷啿绐佺殑鏁版嵁");
}
//鎬诲ぉ鏁�
- Integer countDays = DateUtil.daysBetweenDates(DateUtil.getMontageDate(detail.getEndTime(), 2), applyChange.getApplyStartTime());
+ 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.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), applyChange.getApplyStartTime()) + 1;
+ Integer days = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0);
//濡傛灉宸插凡浜х敓璐圭敤锛岃绠楀凡宸蹭骇鐢熻垂鐢�
- add.setCurrentFee(new BigDecimal(days).multiply(price));
+ add.setCurrentFee(new BigDecimal(days).multiply(detail.getPrice()));
}else{
add.setCurrentFee(BigDecimal.ZERO);
}
@@ -734,10 +802,9 @@
add.setSex(Constants.getSexByIdCard(detail.getIdcardNo()));
add.setMemberName(detail.getMemberName());
add.setDuId(detail.getDuId());
- add.setStartTime(applyChange.getApplyStartTime());
add.setStartTime(DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1));
add.setEndTime(DateUtil.getMontageDate(detail.getEndTime(), 2));
- add.setFee(new BigDecimal(countDays).multiply(price));
+ add.setFee(new BigDecimal(countDays).multiply(detail.getPrice()));
applyDetailJoinMapper.insert(add);
detail.setFee(add.getFee());
@@ -746,9 +813,8 @@
.set(ApplyChagneDetail::getStartTime,DateUtil.getMontageDate(applyChange.getApplyStartTime(), 1))
.eq(ApplyChagneDetail::getId,detail.getId())
);
-
- totalFee = totalFee.add(add.getFee());
- currentFee = currentFee.add(add.getCurrentFee());
+ bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(add.getFee()));
+ bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(add.getCurrentFee()));
MemberInsurance memberInsurance = new MemberInsurance(detail, applyChange, applyChange.getEditor(), add.getId(),applyChange.getSolutionsId());
memberInsurance.setStartTime(add.getStartTime());
@@ -761,13 +827,8 @@
* 鍑忎繚鏁版嵁澶勭悊
* @param applyChange
* @param detail
- * @param applyDetail
- * @param price
- * @param currentFee
- * @param totalFee
*/
- public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,ApplyDetail applyDetail
- ,BigDecimal price,BigDecimal currentFee,BigDecimal totalFee){
+ public void reduceChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,BigDecimalVO bigDecimalVO){
//鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁
ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda()
.eq(ApplyDetail::getApplyId, applyChange.getApplyId())
@@ -782,15 +843,16 @@
BigDecimal pullFee = BigDecimal.ZERO;
//鍑忎繚鍑忓皯鐨勯噾棰�
BigDecimal reduceFee = BigDecimal.ZERO;
- if (DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2),applyChange.getApplyStartTime()) > 0) {
+ if (DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0) > 0) {
//璁＄畻澶氭墸閲戦
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(new Date(), 2), applyChange.getApplyStartTime()) + 1;
- pullFee = new BigDecimal(days).multiply(price).multiply(new BigDecimal(-1));
+
+ Integer days = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(new Date(), 2),0);
+ pullFee = new BigDecimal(days).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
}
//璁＄畻鎶曚繚鏄庣粏搴斿噺灏戠殑澶╂暟
- Integer reduceDays = DateUtil.daysBetweenDates(DateUtil.getMontageDate(applyDetail.getEndTime(), 2), applyChange.getApplyStartTime()) + 1;
+ Integer reduceDays = DateUtil.calculateBetween(applyChange.getApplyStartTime(),DateUtil.getMontageDate(oldModel.getEndTime(), 2),0);
if(reduceDays>0){
- reduceFee = new BigDecimal(reduceDays).multiply(price).multiply(new BigDecimal(-1));
+ reduceFee = new BigDecimal(reduceDays).multiply(detail.getPrice()).multiply(new BigDecimal(-1));
}
applyDetailJoinMapper.update(null, new UpdateWrapper<ApplyDetail>().lambda()
.setSql(" fee = ifnull(fee,0)+" + reduceFee)
@@ -801,8 +863,9 @@
.set(ApplyDetail::getEditDate, applyChange.getEditDate())
.eq(ApplyDetail::getId, oldModel.getId())
);
- totalFee = totalFee.add(reduceFee);
- currentFee = currentFee.add(pullFee);
+
+ bigDecimalVO.setTotalFee(bigDecimalVO.getTotalFee().add(reduceFee));
+ bigDecimalVO.setCurrentFee(bigDecimalVO.getCurrentFee().add(pullFee));
//淇敼 鍛樺伐鎶曚繚鏄庣粏璁板綍 鍘嗗彶鏁版嵁
memberInsuranceJoinMapper.update(null, new UpdateWrapper<MemberInsurance>().lambda()
@@ -820,7 +883,7 @@
);
}
- public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail,ApplyDetail applyDetail,BigDecimal price){
+ public void otherChangeDetailData(ApplyChange applyChange,ApplyChagneDetail detail){
//瀹為檯鎵瑰崟鐢熸晥鏃ユ湡
Date applyStartTime = DateUtil.getMontageDate(applyChange.getApplyStartTime(),1);
@@ -852,8 +915,8 @@
//褰撳墠鏃ユ湡澶т簬鎵瑰崟鏃ユ湡 闇�瑕佸洖婊氭暟鎹疄闄呮暟鎹�
Boolean flag = DateUtil.getMontageDate(new Date(),2).compareTo(DateUtil.getMontageDate(applyStartTime,2))>0;
//鎹㈠巶鍚庡巻鍙茶褰曠殑璐圭敤 fee
- Integer days = DateUtil.daysBetweenDates(DateUtil.getMontageDate(applyStartTime,3),DateUtil.getMontageDate(oldModel.getStartTime(),1))+1;
- BigDecimal oldFee = new BigDecimal(days).multiply(price);
+ 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();
@@ -898,7 +961,7 @@
add.setFromId(detail.getId());
applyDetailJoinMapper.insert(add);
- MemberInsurance memberInsurance = new MemberInsurance(applyDetail,applyChange.getId());
+ MemberInsurance memberInsurance = new MemberInsurance(oldModel,applyChange.getId());
memberInsurance.setSolutionId(detail.getSolutionId());
memberInsurance.setWorktypeName(detail.getWorkTypeName());
memberInsurance.setDuName(detail.getDuName());
--
Gitblit v1.9.3