From 38c29f33a63417a161def9109f29f3cdbb3a5dc9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 8 Sep 2021 16:28:34 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BABigDecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/entity/PayMeeting.java | 4 +- .../meeting/entity/PayMeetingSituation.java | 39 +++++++++++++++++++ .../PayMemberProjectSubitemController.java | 6 ++- .../jero/member/entity/PayMemberProject.java | 3 +- .../entity/PayMemberProjectSubitem.java | 7 +++- .../member/entity/TbMemberProjectSubitem.java | 8 +++- ...PayPayMemberProjectSubitemServiceImpl.java | 6 ++- 7 files changed, 63 insertions(+), 10 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 8afd284d..a3747c22 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -176,12 +176,12 @@ public class PayMeeting implements Serializable { /**会议费用*/ @Excel(name = "会议费用", width = 15) @ApiModelProperty(value = "会议费用") - private Integer meetingCosts; + private BigDecimal meetingCosts; /**会议费用（标协会员）*/ @Excel(name = "会议费用（标协会员）", width = 15) @ApiModelProperty(value = "会议费用（标协会员）") - private Integer meetingCostsVip; + private BigDecimal meetingCostsVip; /**会议负责人id*/ @Excel(name = "会议负责人", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 5c19d1fd..a23f8811 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -16,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import javax.validation.constraints.Max; +import javax.validation.constraints.NotNull; + /** * @Description: 会议报名信息 * @Author: jero-boot @@ -65,6 +68,12 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "企业id") private String companyId; + /** + * 企业临时id + */ + @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management_temporary", dicText = "company_name", dicCode = "id",orderNum = "1") + private String companyTemporaryId; + /**企业名称*/ @Excel(name = "企业名称", width = 15) @ApiModelProperty(value = "企业名称") @@ -75,6 +84,12 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "企业联系人id") private String companyContactId; + /** + * 企业联系人临时id + */ + @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2") + private String companyContactTemporaryId; + /**企业联系人姓名*/ @Excel(name = "企业联系人姓名", width = 15) @ApiModelProperty(value = "企业联系人姓名") @@ -223,6 +238,18 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "邮寄联系人") private String postContactId; + /** + * 邮寄联系人临时id + */ + @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3") + private String postContactTemporaryId; + + /** + * 邮寄联系人姓名 + */ + @ApiModelProperty(value = "邮寄联系人姓名") + private String postContactName; + /**邮寄联系人地址*/ @Excel(name = "邮寄联系人地址", width = 15) @ApiModelProperty(value = "邮寄联系人地址") @@ -253,6 +280,18 @@ public class PayMeetingSituation implements Serializable { @ApiModelProperty(value = "是否为新增") private Integer isNew; + /** + * 应收金额 + */ + @ApiModelProperty(value = "应收金额") + private BigDecimal amountReceivable; + + /** + * 实收金额 + */ + @ApiModelProperty(value = "实收金额") + private BigDecimal paidAmount; + /**打包*/ @Excel(name = "打包", width = 15) @ApiModelProperty(value = "打包") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index b9b01c21..0b565f79 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -1,5 +1,6 @@ package com.jero.member.controller; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -9,6 +10,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.math.MathUtil; import cn.hutool.core.util.NumberUtil; import com.jero.common.api.vo.Result; import com.jero.common.exception.JeroBootException; @@ -170,10 +172,10 @@ public class PayMemberProjectSubitemController extends JeroController paymentType = sysBaseAPI.queryDictItemsByCode("payment_type"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java index c89d816a..bdccbaf0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java @@ -1,6 +1,7 @@ package com.jero.member.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -107,7 +108,7 @@ public class PayMemberProject implements Serializable { */ @Excel(name = "收费标准", width = 15) @ApiModelProperty(value = "收费标准") - private Integer chargeStandard; + private BigDecimal chargeStandard; /** * 收费通知号 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 d718b737..17165552 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 @@ -1,6 +1,7 @@ package com.jero.member.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -148,7 +149,7 @@ public class PayMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") @Max(value = 999999999, message = "应收金额格式错误") - private Integer amountReceivable; + private BigDecimal amountReceivable; /** * 实收金额 @@ -156,7 +157,7 @@ public class PayMemberProjectSubitem implements Serializable { //@Excel(name = "实收金额", width = 15,orderNum = "5") @ApiModelProperty(value = "实收金额") @Max(value = 999999999, message = "实收金额格式错误") - private Integer paidAmount; + private BigDecimal paidAmount; /** * 来款方式 @@ -237,4 +238,6 @@ public class PayMemberProjectSubitem implements Serializable { @Dict(dicCode = "yn") private Integer mail; + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java index 5cd4d592..93ea9623 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java @@ -119,7 +119,7 @@ public class TbMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") @Max(value = 999999999, message = "应收金额格式错误") - private Integer amountReceivable; + private BigDecimal amountReceivable; /** * 实收金额 @@ -127,7 +127,7 @@ public class TbMemberProjectSubitem implements Serializable { @Excel(name = "实收金额", width = 15) @ApiModelProperty(value = "实收金额") @Max(value = 999999999, message = "实收金额格式错误") - private Integer paidAmount; + private BigDecimal paidAmount; /**打包*/ @Excel(name = "打包", width = 15,dicCode = "yn") @@ -154,6 +154,10 @@ public class TbMemberProjectSubitem implements Serializable { @ApiModelProperty(value = "邮寄") private Integer mail; + /**来款用途（字典表）*/ + @ApiModelProperty(value = "来款用途（字典表）") + private String chargeUse; + public String convertisEmail(){ return PasswordUtil.decrypt(email); } 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 a99925d5..b4c38dbe 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 @@ -18,6 +18,8 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.valid.group.ChargeNotice; import com.jero.valid.group.Contract; import org.springframework.stereotype.Service; + +import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -64,8 +66,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl