diff --git a/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql b/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql new file mode 100644 index 000000000..cf57a522a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201904252020__UPDATE_PAY_BILL.sql @@ -0,0 +1,3 @@ +alter table wx_pay_bill +change column pay_amount pay_amount bigint(12) +; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java index e6163712b..9305bb8c9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPayBill.java @@ -65,7 +65,7 @@ public class WxPayBill implements Serializable { private String ip; /**支付金额(分)**/ @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") - private Integer payAmount; + private Long payAmount; /**支付发起时间**/ @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") private Date payTimeStart; @@ -149,10 +149,12 @@ public class WxPayBill implements Serializable { public void setIp(String _ip) { ip = _ip; } - public Integer getPayAmount() { + + public Long getPayAmount() { return payAmount; } - public void setPayAmount(Integer _payAmount) { + + public void setPayAmount(Long _payAmount) { payAmount = _payAmount; } public Date getPayTimeStart() { diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java index a0c6219f5..72d238a9f 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java @@ -17,7 +17,7 @@ public class WxPayOrderSP { private String sign_type; // 签名类型 private String body; // 商品简单描述 128 private String out_trade_no; // 商户订单号 - private Integer total_fee; // 支付金额 + private String total_fee; // 支付金额 private String spbill_create_ip; // 支付IP private String goods_tag; // 优惠标识 private String notify_url; // 通知地址 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java index 79a93b3b5..6ee9def84 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayBillServiceImpl.java @@ -97,8 +97,8 @@ public class WxPayBillServiceImpl implements WxPayBillService { } //获取账单数据 Map bill = bills.get(0); - Integer owe = (Integer)bill.get("owe"); - if(owe.intValue()<=0){ + Long owe = (Long) bill.get("owe"); + if (owe.longValue() <= 0) { logger.info("账单欠缴为0"); return new ResultData(ErrorCode.BILL_OWE_ZERO); } @@ -124,7 +124,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { record.setPayTimeEnd(new Date(endtime)); // 支付单号 record.setPayBillNo(payBillNo); - record.setPayAmount((Integer) bill.get("owe")); + record.setPayAmount((Long) bill.get("owe")); record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode()); record.setPayBillStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); record.setShare(isShare.getCode()); @@ -165,7 +165,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { long endtime = currentDate.getTime() + 120 * 60 * 1000; record.setPayTimeEnd(new Date(endtime)); record.setPayBillNo(payBillNo); - record.setPayAmount((Integer) bill.get("owe")); + record.setPayAmount((Long) bill.get("owe")); record.setUpdateTime(currentDate); sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); if (sqlRow != 1) { @@ -208,7 +208,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { long endtime = currentDate.getTime() + 120 * 60 * 1000; record.setPayTimeEnd(new Date(endtime)); record.setPayBillNo(payBillNo); - record.setPayAmount((Integer) bill.get("owe")); + record.setPayAmount((Long) bill.get("owe")); record.setUpdateTime(currentDate); sqlRow = wxPayBillMapper.updateByPrimaryKeySelective(record); if (sqlRow != 1) { @@ -233,7 +233,7 @@ public class WxPayBillServiceImpl implements WxPayBillService { wxPayBillSP.setNonce_str(noncestr); wxPayBillSP.setBody(bill.get("billType").toString()); wxPayBillSP.setOut_trade_no(record.getPayBillNo()); - wxPayBillSP.setTotal_fee((Integer) bill.get("owe")); + wxPayBillSP.setTotal_fee(bill.get("owe").toString()); // 终端IP wxPayBillSP.setSpbill_create_ip(record.getIp()); wxPayBillSP.setNotify_url(payAccount.getPayNotifyUrl()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 03ab953ee..8895e9de9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -315,7 +315,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderSP.setNonce_str(noncestr); wxPayOrderSP.setBody(order.getDetail()); wxPayOrderSP.setOut_trade_no(record.getPayOrderNo()); - wxPayOrderSP.setTotal_fee(order.getPayment()); + wxPayOrderSP.setTotal_fee(order.getPayment().toString()); wxPayOrderSP.setSpbill_create_ip(record.getIp()); // 终端IP wxPayOrderSP.setGoods_tag(String.valueOf(order.getProductId())); // 券ID wxPayOrderSP.setNotify_url(payAccount.getPayNotifyUrl());