update 更改金额类型为BigDecimal

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<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

@@ -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

@@ -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

@@ -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

@@ -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);
 		//打包