From 6a644e6a260572436ad43af97548ba786c5c1251 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 31 Aug 2021 16:51:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/PayMemberProjectSubitem.java | 6 +- ...PayPayMemberProjectSubitemServiceImpl.java | 112 ++++++++++++------ .../main/java/com/jero/util/AmountUtil.java | 33 ++++++ .../src/main/java/com/jero/util/Autil.java | 8 -- 4 files changed, 110 insertions(+), 49 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/util/Autil.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index 3bea1636..8fd65ba4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -84,7 +84,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 企业id */ - @Excel(name = "企业名称", width = 15,dictTable = "pay_company_management",dicText = "company_name",dicCode = "id") + @Excel(name = "企业名称", width = 15,dictTable = "pay_company_management_temporary",dicText = "company_name",dicCode = "id") @ApiModelProperty(value = "企业id") @NotBlank(message = "企业不能为空") @Size(max = 50,message = "企业最大为50字符") @@ -99,7 +99,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 企业联系人id */ - @Excel(name = "企业联系人名称", width = 15,dictTable = "pay_contacts_management",dicText = "name",dicCode = "id") + @Excel(name = "企业联系人名称", width = 15,dictTable = "pay_contacts_management_temporary",dicText = "name",dicCode = "id") @ApiModelProperty(value = "企业联系人id") @NotBlank(message = "企业联系人不能为空") @Size(max = 50,message = "企业联系人最大为50字符") @@ -114,7 +114,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 邮寄联系人id */ - @Excel(name = "邮寄联系人姓名", width = 15,dictTable = "pay_contacts_management",dicText = "name",dicCode = "id") + @Excel(name = "邮寄联系人姓名", width = 15,dictTable = "pay_contacts_management_temporary",dicText = "name",dicCode = "id") @ApiModelProperty(value = "邮寄联系人id") @NotBlank(message = "邮寄联系人不能为空") private String postContactId; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 9e101b37..a8bef97f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -2,14 +2,13 @@ package com.jero.member.service.impl; import com.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.company.entity.PayContactsManagement; -import com.jero.company.mapper.PayCompanyManagementMapper; -import com.jero.company.mapper.PayContactsManagementMapper; +import com.jero.companyTemporary.entity.PayCompanyManagementTemporary; +import com.jero.companyTemporary.entity.PayContactsManagementTemporary; +import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService; +import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService; import com.jero.member.entity.PayMemberProjectSubitem; import com.jero.member.mapper.PayMemberProjectSubitemMapper; import com.jero.member.service.IPayMemberProjectSubitemService; -import com.jero.modules.system.volid.group.Group; import com.jero.valid.group.ChargeNotice; import com.jero.valid.group.Contract; import org.springframework.stereotype.Service; @@ -27,17 +26,26 @@ import javax.annotation.Resource; @Service public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl implements IPayMemberProjectSubitemService { @Resource - private PayCompanyManagementMapper companyManagementMapper; + private IPayCompanyManagementTemporaryService companyManagementTemporaryService; @Resource - private PayContactsManagementMapper contactsManagementMapper; + private IPayContactsManagementTemporaryService contactsManagementTemporaryService; /** * 保存 */ @Override public void add(PayMemberProjectSubitem payMemberProjectSubitem) { validMemberProjectSubitem(payMemberProjectSubitem); - payMemberProjectSubitem.setAmountReceivable(0); + //实收金额 + payMemberProjectSubitem.setPaidAmount(0); + //到账 + payMemberProjectSubitem.setInAccount(0); + //打包 + payMemberProjectSubitem.setPack(0); + //开票 + payMemberProjectSubitem.setMakeInvoice(0); + //邮寄 + payMemberProjectSubitem.setMail(0); save(payMemberProjectSubitem); } @@ -46,6 +54,23 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl ids) { + for (String id : ids) { + PayMemberProjectSubitem payMemberProjectSubitem = getById(id); + //删除临时表数据 + String companyId = payMemberProjectSubitem.getCompanyId(); + companyManagementTemporaryService.removeById(companyId); + + String companyContactId = payMemberProjectSubitem.getCompanyContactId(); + contactsManagementTemporaryService.removeById(companyContactId); + + String postContactId = payMemberProjectSubitem.getPostContactId(); + contactsManagementTemporaryService.removeById(postContactId); + } removeByIds(ids); } 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 new file mode 100644 index 00000000..1005bcba --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/util/AmountUtil.java @@ -0,0 +1,33 @@ +package com.jero.util; + +/** + * 金额工具类 + * + * @author liJiaRao + * @date 2021-08-31 15:28 + */ +public class AmountUtil { + /** + * 计算到账状态 + * + * @param amountReceivable 应收金额 + * @param paidAmount 实收金额 + * @return + */ + public static int calculate(Integer amountReceivable, Integer paidAmount) { + //应收金额大于0时 + if (amountReceivable > 0) { + //实收金额等于应收金额 + if (paidAmount.equals(amountReceivable)) { + return 2; + //实收金额大于0小于应收金额时 + } else if (paidAmount > 0 && paidAmount < amountReceivable) { + return 1; + //实收金额等于0时 + } else { + return 0; + } + } + return 0; + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/util/Autil.java b/jero-boot-incoming-payment/src/main/java/com/jero/util/Autil.java deleted file mode 100644 index e32af6a7..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/util/Autil.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jero.util; - -/** - * @author liJiaRao - * @date 2021-08-26 10:12 - */ -public class Autil { -}