LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 修改打包管理类型值为8

Browse Source
This commit is contained in:
mzaxd
2024-03-11 11:34:38 +08:00
parent 5184461abf
commit beb4e7952d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class PayIncomeContractCommon {
/** /**
* 7:打包项目 * 7:打包项目
*/ */
public final static String PROJECT_TYPE7 = "7"; public final static String PROJECT_TYPE8 = "8";
/** /**
* 来款状态 0：全部 1:到期未付款 * 来款状态 0：全部 1:到期未付款
*/ */
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+2 -2
View File
@@ -393,7 +393,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
} }
break; break;
//打包项目 //打包项目
case PayIncomeContractCommon.PROJECT_TYPE7: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(p.getProjectId()); PayPackCompany payPackCompany = payPackCompanyService.getById(p.getProjectId());
if (Objects.isNull(payPackCompany)) { if (Objects.isNull(payPackCompany)) {
throw new JeroBootException("项目不存在！"); throw new JeroBootException("项目不存在！");
@@ -973,7 +973,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
// return "标协证书项目必须先审核通过才可开票"; // return "标协证书项目必须先审核通过才可开票";
//} //}
// 普通项目 // 普通项目
case PayIncomeContractCommon.PROJECT_TYPE7: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(bmpList.get(i).getProjectId()); PayPackCompany payPackCompany = payPackCompanyService.getById(bmpList.get(i).getProjectId());
//将第一个项目作为基准公司 //将第一个项目作为基准公司
if (i == 0) { if (i == 0) {
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
} }
break; break;
// 打包项目 // 打包项目
case PayIncomeContractCommon.PROJECT_TYPE7: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(projectId); PayPackCompany payPackCompany = payPackCompanyService.getById(projectId);
if (payPackCompany == null) { if (payPackCompany == null) {
throw new JeroBootException("项目不存在"); throw new JeroBootException("项目不存在");
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+1 -1
View File
@@ -564,7 +564,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
break; break;
// 打包项目 // 打包项目
case PayIncomeContractCommon.PROJECT_TYPE7: case PayIncomeContractCommon.PROJECT_TYPE8:
PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId()); PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
newPaidAmount = addPaidAmount(payPackCompany.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收 newPaidAmount = addPaidAmount(payPackCompany.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收