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

update 更改金额类型为BigDecimal

Browse Source
This commit is contained in:
lijiarao
2021-09-08 16:28:34 +08:00
parent aad8b473e8
commit 38c29f33a6
7 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+2 -2
View File
@@ -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")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+39
View File
@@ -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 = "打包")
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+4 -2
View File
@@ -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<PayMemberP
//应收金额
String amountReceivable = projectSubitemExcel.getAmountReceivable();
if (!NumberUtil.isInteger(amountReceivable)) {
if (!NumberUtil.isNumber(amountReceivable)) {
errorMessage.add("第"+errorRowNum+"行：应收金额不符合规范");
}else {
projectSubitem.setAmountReceivable(Integer.parseInt(amountReceivable));
projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
}
//来款方式
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProject.java
+2 -1
View File
@@ -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;
/**
* 收费通知号
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+5 -2
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+6 -2
View File
@@ -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);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+5 -1
View File
@@ -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<PayMember
throw new JeroBootException("会员单位已经存在");
}
validMemberProjectSubitem(payMemberProjectSubitem);
//应收金额
payMemberProjectSubitem.setAmountReceivable(memberProject.getChargeStandard());
//实收金额
payMemberProjectSubitem.setPaidAmount(0);
payMemberProjectSubitem.setPaidAmount(new BigDecimal("0.00"));
//到账
payMemberProjectSubitem.setInAccount(0);
//打包