diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java index 4b6712c8..59602688 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/ProjectDetailService.java @@ -28,11 +28,11 @@ public interface ProjectDetailService { */ List queryProjectList(List list); /** - * @Description 获取变更应收金额之后的状态 + * @Description 获取变更待确收金额之后的状态 * @Author lqt * @Date 2021/9/14 * @Param projectId 项目id - * @Param receivableAmount 应收金额 + * @Param receivableAmount 待确收金额 * @Param needInvoice 需要发票 * @Return * @Exception diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index d331adfc..817fc889 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -358,13 +358,13 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.isNull(payCommonProject.getPaidAmount())){ payCommonProject.setPaidAmount(new BigDecimal("0.00")); } - // 应收金额没有变更 && 验证来款方式没有变更 + // 待确收金额没有变更 && 验证来款方式没有变更 if(receivableAmount.compareTo(payCommonProject.getReceivableAmount()) == 0 && needInvoice.equals(payCommonProject.getNeedInvoice())){ return null; } - // 验证应收金额不能小于实收金额 + // 验证待确收金额不能小于实收金额 if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) < 0){ - throw new JeroBootException("应收金额不能小于实收金额!"); + throw new JeroBootException("待确收金额不能小于实收金额!"); } // 验证来款方式,有变更,按照变更处理 if(!needInvoice.equals(payCommonProject.getNeedInvoice())){ @@ -384,7 +384,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { BigDecimal b = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add); invoice = invoice.add(b); if(receivableAmount.compareTo(invoice) < 0){ - throw new JeroBootException("应收金额不可小于实收金额,请先修改实际来款后再来修改!"); + throw new JeroBootException("待确收金额不可小于实收金额,请先修改实际来款后再来修改!"); } List list = listPayMailBillProject.stream().map(PayMailBillProject::getBillId).collect(Collectors.toList()); LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); @@ -394,7 +394,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { y = listPayMailBill.size(); } // 到账 - // 应收金额 = 实收金额 = 1 + // 待确收金额 = 实收金额 = 1 if(receivableAmount.compareTo(payCommonProject.getPaidAmount()) == 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT1); } @@ -402,7 +402,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) == 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT0); } - // 0 < 实收金额 && 实收金额 < 应收金额 = 2 + // 0 < 实收金额 && 实收金额 < 待确收金额 = 2 if(payCommonProject.getPaidAmount().compareTo(new BigDecimal("0.00")) > 0 && payCommonProject.getPaidAmount().compareTo(receivableAmount) < 0){ projectStatusVO.setInAccount(ProjectCommon.IN_ACCOUNT2); @@ -412,7 +412,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(Objects.equals(payCommonProject.getNeedInvoice(),ProjectCommon.NEED_INVOICE0)){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); }else{ - // 开票金额 = 应收金额 = 1 + // 开票金额 = 待确收金额 = 1 if(invoice.compareTo(receivableAmount) == 0 ){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE1); } @@ -420,13 +420,13 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(invoice.compareTo(new BigDecimal("0.00")) == 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE0); } - // 开票金额 > 0 && 开票金额 < 应收金额 = 2 + // 开票金额 > 0 && 开票金额 < 待确收金额 = 2 if(invoice.compareTo(new BigDecimal("0.00")) > 0 && invoice.compareTo(payCommonProject.getReceivableAmount()) < 0){ projectStatusVO.setMakeInvoice(ProjectCommon.MAKE_INVOICE2); } } // 邮寄 - // 开票金额 = 应收金额 && 邮寄次数 = 开票次数 = 1 + // 开票金额 = 待确收金额 && 邮寄次数 = 开票次数 = 1 if(invoice.compareTo(receivableAmount) == 0 && c == y){ projectStatusVO.setMail(ProjectCommon.MAIL1); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java index 7141e18d..a2a45ed5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java @@ -24,9 +24,9 @@ public class ProjectDetailVO implements Serializable { @ApiModelProperty(value = "项目类型") private Integer projectType; /** - * 应收金额 + * 待确收金额 */ - @ApiModelProperty(value = "应收金额") + @ApiModelProperty(value = "待确收金额") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 03c3441f..f54393d6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -663,7 +663,7 @@ public class PayIncomeContractController extends JeroController listPayMailBill = payMailBillService.list(queryPayMailBill); y = listPayMailBill.size(); } - //获取项目应收金额 + //获取项目待确收金额 BigDecimal receivableAmount = new BigDecimal("0.00"); String project = ""; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index 2f67509b..0998b977 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -793,7 +793,7 @@ public class PayMailBillServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -220,7 +220,7 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl0 && 实收金额 == 应收金额 + // 应收>0 && 实收金额 == 待确收金额 if(amountReceivable.compareTo(new BigDecimal("0.00")) > 0 && paidAmount.compareTo(amountReceivable) == 0){ paymentStatus = PaymentStatusEnum.COMPLETED.getCode();//已完结 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java index 9609e967..2417d387 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayCommonProject.java @@ -90,11 +90,11 @@ public class PayCommonProject implements Serializable { @ApiModelProperty(value = "临时联系人名称") @Excel(name = "企业联系人", width = 15,orderNum = "3") private String contactsTemporaryName; - /**应收金额(元)*/ - @Excel(name = "应收金额(元)", width = 15,orderNum = "4") - @ApiModelProperty(value = "应收金额(元)") - @NotNull(message = "应收金额(元)不能为空") - @DecimalMax(value = "9999999999.99",message = "应收金额(元)格式错误") + /**待确收金额(元)*/ + @Excel(name = "待确收金额(元)", width = 15,orderNum = "4") + @ApiModelProperty(value = "待确收金额(元)") + @NotNull(message = "待确收金额(元)不能为空") + @DecimalMax(value = "9999999999.99",message = "待确收金额(元)格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额(元)*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index 00f95412..c1f53e7b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -117,10 +117,10 @@ public class PayWorkingGroupSubItem implements Serializable { @ApiModelProperty(value = "来款方式(1:无,2:合同,3:收费通知)") @NotNull(message = "来款方式不能为空") private java.lang.Integer chargeWay; - /**应收金额(元)*/ - @Excel(name = "应收金额(元)", width = 15) - @ApiModelProperty(value = "应收金额(元)") - @DecimalMax(value = "9999999999.99",message = "应收金额(元)格式错误") + /**待确收金额(元)*/ + @Excel(name = "待确收金额(元)", width = 15) + @ApiModelProperty(value = "待确收金额(元)") + @DecimalMax(value = "9999999999.99",message = "待确收金额(元)格式错误") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /**实收金额(元)*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java index 88d49dd0..9a8285ce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java @@ -149,7 +149,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -223,7 +223,7 @@ public class PayCommonProjectServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java index 6388cf01..5caccda1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java @@ -183,7 +183,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl 0){ paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1); } @@ -331,7 +331,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第").append(count + 3).append("行:待确收金额不能为空,请修改。
"); } if (StringUtils.isBlank(p.getContractNum())) { msg.append("第").append(count + 3).append("行:合同号不能为空,请修改。
"); @@ -660,7 +660,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl"); + msg.append("第").append(count + 3).append("行:待确收金额不能为空,请修改。
"); } } p.setChargeUse(PayProjectCommon.CHARGE_USE1); @@ -925,7 +925,7 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); - // 变更应收金额,重新校验状态 + // 变更待确收金额,重新校验状态 ProjectStatusVO projectStatusVO = projectDetailService.getStatus(p.getId(),input.getReceivableAmount(),p.getNeedInvoice()); if(!Objects.isNull(projectStatusVO)){ if(!Objects.isNull(projectStatusVO.getInAccount())){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java index 4c44d057..8d8df73c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java @@ -20,10 +20,10 @@ public class SetChargeInput implements Serializable { @ApiModelProperty(value = "收费通知唯一标识(收费通知号A:a,收费通知号B:b)") @NotEmpty(message = "收费通知唯一标识不能为空") private java.lang.String charge; - /**应收金额(元)*/ - @ApiModelProperty(value = "应收金额(元)") - @DecimalMax(value = "9999999999.99",message = "应收金额(元)格式错误") - @NotNull(message = "应收金额(元)不能为空!") + /**待确收金额(元)*/ + @ApiModelProperty(value = "待确收金额(元)") + @DecimalMax(value = "9999999999.99",message = "待确收金额(元)格式错误") + @NotNull(message = "待确收金额(元)不能为空!") private BigDecimal receivableAmount; /**收费通知号*/ @ApiModelProperty(value = "收费通知号") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 4bd92799..f114a460 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -38,10 +38,10 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @ApiModelProperty(value = "来款方式(1:无,2:合同,3:收费通知)") private Integer chargeWay; /** - * 应收金额(元) + * 待确收金额(元) */ - @Excel(name = "应收金额(元)", width = 15) - @ApiModelProperty(value = "应收金额(元)") + @Excel(name = "待确收金额(元)", width = 15) + @ApiModelProperty(value = "待确收金额(元)") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java index 013eb081..ef52a68e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java @@ -22,17 +22,17 @@ public class AmountUtil { /** * 计算到账状态 * - * @param amountReceivable 应收金额 + * @param amountReceivable 待确收金额 * @param paidAmount 实收金额 * @return */ public static int calculate(Integer amountReceivable, Integer paidAmount) { - //应收金额大于0时 + //待确收金额大于0时 if (amountReceivable > 0) { - //实收金额等于应收金额 + //实收金额等于待确收金额 if (paidAmount.equals(amountReceivable)) { return 2; - //实收金额大于0小于应收金额时 + //实收金额大于0小于待确收金额时 } else if (paidAmount > 0 && paidAmount < amountReceivable) { return 1; //实收金额等于0时