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

修改bug#40595

Browse Source
This commit is contained in:
梁琦涛
2021-10-14 15:09:59 +08:00
parent d32883f52f
commit bf5ec65ce0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+5 -2
View File
@@ -242,7 +242,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
if(StringUtils.isBlank(projectId)){ if(StringUtils.isBlank(projectId)){
throw new JeroBootException("项目id不能为空！"); throw new JeroBootException("项目id不能为空！");
} }
if(Objects.isNull(receivableAmount) ||receivableAmount.compareTo(new BigDecimal("0.00")) == 0){ if(Objects.isNull(receivableAmount)){
return null; return null;
} }
// 获取项目信息 // 获取项目信息
@@ -256,11 +256,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
if(Objects.isNull(payCommonProject.getPaidAmount())){ if(Objects.isNull(payCommonProject.getPaidAmount())){
payCommonProject.setPaidAmount(new BigDecimal("0.00")); payCommonProject.setPaidAmount(new BigDecimal("0.00"));
} }
// 应收金额没有变更 && 验证来款方式没有变更 // 应收金额没有变更 && 验证来款方式没有变更
if(receivableAmount.compareTo(payCommonProject.getReceivableAmount()) == 0 && needInvoice.equals(payCommonProject.getNeedInvoice())){ if(receivableAmount.compareTo(payCommonProject.getReceivableAmount()) == 0 && needInvoice.equals(payCommonProject.getNeedInvoice())){
return null; return null;
} }
// 验证应收金额不能小于实收金额
if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) < 0){
throw new JeroBootException("应收金额不能小于实收金额！");
}
// 验证来款方式,有变更，按照变更处理 // 验证来款方式,有变更，按照变更处理
if(!needInvoice.equals(payCommonProject.getNeedInvoice())){ if(!needInvoice.equals(payCommonProject.getNeedInvoice())){
payCommonProject.setNeedInvoice(needInvoice); payCommonProject.setNeedInvoice(needInvoice);
jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyProjectController.java
+5 -2
View File
@@ -122,8 +122,11 @@ public class PayPackCompanyProjectController extends JeroController<PayPackCompa
if(!StringUtils.isBlank(p.getEmail())){ if(!StringUtils.isBlank(p.getEmail())){
p.setEmail(PasswordUtil.decrypt(p.getEmail())); p.setEmail(PasswordUtil.decrypt(p.getEmail()));
} }
if(Objects.isNull(p.getInvoiceAmount())){ if(Objects.isNull(p.getReceivableAmount())){
p.setInvoiceAmount(new BigDecimal("0.00")); p.setReceivableAmount(new BigDecimal("0.00"));
}
if(Objects.isNull(p.getPaidAmount())){
p.setPaidAmount(new BigDecimal("0.00"));
} }
}); });
} }