From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 09 四月 2024 09:03:01 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 226 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 167 insertions(+), 59 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 d113bb0..1d2852d 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,5 +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; @@ -11,13 +13,11 @@ import com.doumee.core.utils.DateUtil; import com.doumee.core.utils.Utils; import com.doumee.dao.business.*; -import com.doumee.dao.business.dto.SaveUnionApplyDTO; -import com.doumee.dao.business.dto.SaveUnionChangeDTO; -import com.doumee.dao.business.dto.SmsCheckDTO; -import com.doumee.dao.business.dto.UnionChangeBXDDTO; +import com.doumee.dao.business.dto.*; import com.doumee.dao.business.join.*; import com.doumee.dao.business.model.*; import com.doumee.dao.business.vo.CountCyclePriceVO; +import com.doumee.dao.system.model.SystemUser; import com.doumee.service.business.SmsEmailService; import com.doumee.service.business.UnionChangeService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -92,6 +92,11 @@ @Autowired private MultifileMapper multifileMapper; + @Autowired + private ApplyLogMapper applyLogMapper; + + @Autowired + private ApplyLogJoinMapper applyLogJoinMapper; @Override public Integer create(UnionChange unionChange) { unionChangeMapper.insert(unionChange); @@ -157,9 +162,68 @@ .eq(UnionChange::getId,id) .last(" limit 1 ") ); + + 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>() + .selectAll(ApplyLog.class) + .selectAs(SystemUser::getRealname,ApplyLog::getCreatorName) + .selectAs(Company::getName,ApplyLog::getCompanyName) + .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.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 @@ -179,15 +243,17 @@ IPage<UnionChange> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity()); MPJLambdaWrapper<UnionChange> queryWrapper = new MPJLambdaWrapper<>(); queryWrapper.selectAll(UnionChange.class); - queryWrapper.selectAs(UnionApply::getCode,UnionChange::getApplyCode) + 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) .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1 )",UnionChange::getDelNum) .select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2 )",UnionChange::getChangeNum); queryWrapper.leftJoin(UnionApply.class,UnionApply::getId,UnionChange::getUnionApplyId); queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId); LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - if(user.getType().equals(Constants.TWO)){ - queryWrapper.eq(UnionChange::getShopId, pageWrap.getModel().getShopId()); + if(Constants.equalsInteger(user.getType(),Constants.TWO)){ + queryWrapper.eq(UnionChange::getShopId, user.getCompanyId()); } Utils.MP.blankToNull(pageWrap.getModel()); if (pageWrap.getModel().getId() != null) { @@ -270,9 +336,10 @@ @Override + @Transactional(rollbackFor = {BusinessException.class,Exception.class}) public Integer merge(SaveUnionChangeDTO saveUnionChangeDTO){ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); - if(user.getType().equals(Constants.TWO)){ + if(!user.getType().equals(Constants.TWO)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�"); } if(Objects.isNull(saveUnionChangeDTO) @@ -289,8 +356,8 @@ .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyChange::getApplyId) .eq(ApplyChange::getIsdeleted, Constants.ZERO) .eq(InsuranceApply::getUnionApplyId,saveUnionChangeDTO.getUnionApplyId()) - .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.PALTFORM_CHECK_PASS.getKey()) - .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()) + .eq(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()) + .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey()) .eq(ApplyChange::getType,saveUnionChangeDTO.getBusinessType()) .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds()) .isNull(ApplyChange::getUnionChangeId) @@ -304,8 +371,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); @@ -314,12 +382,20 @@ .set(ApplyChange::getUnionChangeId,unionChange.getId()) .set(ApplyChange::getCheckDate,new Date()) .set(ApplyChange::getCheckUserId,user.getId()) + .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.WTB_TOUBAOING.getKey()) .in(ApplyChange::getId,saveUnionChangeDTO.getApplyIds()) ); 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; + ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null + ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange)); + applyLogMapper.insert(log); + return unionChange.getId(); } @@ -330,19 +406,27 @@ /** * 鍙栨秷淇濆崟鍚堝苟 - * @param id + * @param closeDTO */ @Override @Transactional(rollbackFor = {Exception.class,BusinessException.class}) - public void cancelMerge(Integer id){ + public void cancelMerge(CloseDTO closeDTO){ + if(Objects.isNull(closeDTO) + ||Objects.isNull(closeDTO.getId()) + ||StringUtils.isBlank(closeDTO.getReason())){ + 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(id); + 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(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒"); } @@ -357,22 +441,34 @@ .set(ApplyChange::getUnionChangeId,null) .set(ApplyChange::getCheckDate,new Date()) .set(ApplyChange::getCheckUserId,user.getId()) + .set(ApplyChange::getStatus,Constants.ApplyChangeStatus.CHECHED_PASSED.getKey()) .in(ApplyChange::getUnionChangeId,unionChange.getId()) ); 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_CLOSE; + String info =applyLogType.getInfo(); + info = info.replace("${param}", closeDTO.getReason()); + ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), info + ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange)); + applyLogMapper.insert(log); + } + @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) @@ -389,8 +485,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) ); @@ -442,6 +540,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); } @@ -454,7 +553,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()); @@ -507,6 +606,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(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒"); } @@ -516,7 +617,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(),"瀵逛笉璧凤紝鍚堝苟鍗曠姸鎬佸凡娴佽浆"); } @@ -556,19 +657,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()); @@ -576,7 +675,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()); @@ -587,8 +691,21 @@ .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()) ); + + + Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_UPLOAD_INSURANCE; + ApplyLog log = new ApplyLog(unionChange,applyLogType.getName(), null + ,unionChange.getId(),applyLogType.getKey(),null, JSONObject.toJSONString(unionChange)); + applyLogMapper.insert(log); + + if(true){ + throw new BusinessException(ResponseStatus.BAD_REQUEST); + } } @@ -598,24 +715,17 @@ 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(); 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,detail.getPrice(),currentFee,totalFee); }else if(Constants.equalsInteger(detail.getType(),Constants.ONE)){ - this.reduceChangeDetailData(applyChange,detail,applyDetail,price,currentFee,totalFee); + this.reduceChangeDetailData(applyChange,detail,currentFee,totalFee); }else{ - this.otherChangeDetailData(applyChange,detail,applyDetail,price); + this.otherChangeDetailData(applyChange,detail); } } @@ -660,11 +770,12 @@ 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)); }else{ @@ -684,7 +795,6 @@ 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)); @@ -711,13 +821,10 @@ * 鍑忎繚鏁版嵁澶勭悊 * @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,BigDecimal currentFee,BigDecimal totalFee){ //鏌ヨ鍛樺伐鏄湪涓诲崟涓� 鏄惁瀛樺湪鐢熸晥涓殑鏁版嵁 ApplyDetail oldModel = applyDetailJoinMapper.selectOne(new QueryWrapper<ApplyDetail>().lambda() .eq(ApplyDetail::getApplyId, applyChange.getApplyId()) @@ -732,15 +839,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) @@ -770,7 +878,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); @@ -802,8 +910,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(); @@ -848,7 +956,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