From 32929606943fedfca286b052bcb280193a3e0222 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 18 一月 2025 10:23:58 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 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 9c2b9a9..deac02d 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
@@ -263,6 +263,9 @@
if (pageWrap.getModel().getCreator() != null) {
queryWrapper.eq(UnionChange::getCreator, pageWrap.getModel().getCreator());
}
+ if (pageWrap.getModel().getSolutionsName() != null) {
+ queryWrapper.eq(Solutions::getName, pageWrap.getModel().getSolutionsName());
+ }
if (pageWrap.getModel().getQueryStartTime() != null) {
queryWrapper.ge(UnionChange::getCreateDate, pageWrap.getModel().getQueryStartTime() +" 00:00:00" );
@@ -351,10 +354,10 @@
if(!(Constants.equalsInteger(user.getType(),Constants.ZERO) || Constants.equalsInteger(user.getType(),Constants.TWO))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴峰钩鍙扮敤鎴凤紝鏃犳硶杩涜璇ユ搷浣�");
}
- if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)||Objects.isNull(saveUnionChangeDTO.getApplyDate())){
- //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
- saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
- }
+// if(saveUnionChangeDTO.getBusinessType().equals(Constants.ZERO)||Objects.isNull(saveUnionChangeDTO.getApplyDate())){
+// //2024骞�5鏈�9鏃�14:59:24 淇敼 榛樿鍏ュ綋鍓嶅ぉ
+// saveUnionChangeDTO.setApplyDate(DateUtil.getMontageDate(new Date(),1));
+// }
if(Objects.isNull(saveUnionChangeDTO)
|| Objects.isNull(saveUnionChangeDTO.getApplyIds())
|| Objects.isNull(saveUnionChangeDTO.getApplyDate())
@@ -626,6 +629,7 @@
String companyName = "";
String creditCode = "";
String email = "";
+ String signId = "";
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
if(!unionChange.getShopId().equals(user.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_ERRO.getCode(),"瀵逛笉璧烽潪鎮ㄧ殑鍚堝苟鍗曪紝鎮ㄦ棤娉曡繘琛屾搷浣滐紒");
@@ -637,6 +641,7 @@
companyName = company.getName();
creditCode = company.getCode();
email = company.getEmail();
+ signId = company.getSignId();
}else{
companyName = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_COMPANY_NAME).getCode();
creditCode = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PLAT_CREDIT_CODE).getCode();
@@ -655,17 +660,17 @@
String fileUrl = null;
-// if(Constants.equalsObject(unionChange.getType(), Constants.ONE)){
-// fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeOtherUnitExcelToPdf(unionChange,"鎹㈠巶鐢宠琛�");
-// }else{
-// fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeExcelToPdf(unionChange,"鍔犲噺淇濈敵璇疯〃");
-// }
+ if(Constants.equalsObject(unionChange.getType(), Constants.ONE)){
+ fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeOtherUnitExcelToPdf(unionChange,"鎹㈠巶鐢宠琛�");
+ }else{
+ fileUrl = ExcelExporter.build(UnionChange.class).exportUnionChangeExcelToPdf(unionChange,"鍔犲噺淇濈敵璇疯〃");
+ }
String notifyUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SIGN_DONE_NOTIFY_URL).getCode();
notifyUrl = notifyUrl.replace("${type}","0").replace("${id}",unionChange.getId().toString());
-// String applyNo = signService.applySignLocalFile(company.getName(),company.getName(),fileUrl,company.getCode(),company.getEmail(),"鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛夌敵璇风缃�",company.getSignId(),notifyUrl);
+ String applyNo = signService.applySignLocalFileByParam(companyName,companyName,fileUrl,creditCode,email,"鍚堝苟鍗曪紙鍔犲噺淇�/鎹㈠巶锛夌敵璇风缃�",null,notifyUrl,new Float(0.7));
//涓存椂浣跨敤
- fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";
- String applyNo = signService.applySignWidthQifengSet(companyName,fileUrl,companyName,creditCode,email,"浜哄憳鍚嶅崟绛剧珷",null,notifyUrl,new Float(0.7));
+// fileUrl = "https://yybred.oss-cn-hangzhou.aliyuncs.com/apply/20241230/a0d128f2-ba6c-4ad4-b86b-b2610a513d41.pdf";
+// String applyNo = signService.applySignWidthQifengSet(companyName,fileUrl,companyName,creditCode,email,"浜哄憳鍚嶅崟绛剧珷",null,notifyUrl,new Float(0.7));
if(StringUtils.isBlank(applyNo) ){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇鍦ㄧ嚎绛剧珷鍦板潃澶辫触锛岃绋嶅悗閲嶈瘯锛�");
}
@@ -1064,17 +1069,19 @@
BigDecimal reduceFee = BigDecimal.ZERO;
//濡傛灉鎵瑰崟鏃ユ湡 澶т簬 鍛樺伐淇濆崟鐨勫紑濮嬫棩鏈�
- if(applyChange.getDelValidTime().getTime() > oldModel.getStartTime().getTime()){
- if(reduceDate.getTime()>oldModel.getStartTime().getTime()){
- reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
- }else{
- reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
- }
- //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
- reduceFee = Constants.reduceFee(
- solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
+ if(reduceDate.getTime() > oldModel.getStartTime().getTime()){
+ reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
+// if(reduceDate.getTime()<oldModel.getStartTime().getTime()){
+// reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
+// }else{
+// reduceDate = DateUtil.getMontageDate(applyChange.getDelValidTime(), 3);
+// }
+ }else{
+ reduceDate = DateUtil.getMontageDate(oldModel.getStartTime(), 3);
}
-
+ //鍑忎繚璁板綍鎿嶄綔鍚庣殑鎬昏垂鐢�
+ reduceFee = Constants.reduceFee(
+ solutions,fee,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),oldModel.getStartTime(),reduceDate) ;
BigDecimal pullFee = BigDecimal.ZERO;
if (oldModel.getStartTime().getTime() < System.currentTimeMillis()) {
--
Gitblit v1.9.3