From db99e3940196a6312ef578ef00dd063b0cae8a9b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 22 Oct 2019 11:42:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=B4=A6=E5=8D=95=E6=AC=A0=E7=BC=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillOtherServiceImpl.java | 6 +++--- .../service/impl/WxBillPropertyDepositServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 48bcf020e..4d8f7c4a2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -142,10 +142,10 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { @Override public ResultData saveOrUpdate(WxBillOther record, MallUserInfo user) { - int receivepay = record.getReceivePay()==null?0:record.getReceivePay().intValue(); + int receivepay = record.getRealReceivePay() == null ? 0 : record.getRealReceivePay().intValue(); int pay = record.getPay()==null?0:record.getPay().intValue(); if(pay>receivepay){ - return new ResultData(ErrorCode.BILL_PAY_ERROR,"实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); } Date date = new Date(); if (record.getId() == null) { @@ -166,7 +166,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); - record.setOwe(record.getReceivePay()-record.getPay()); + record.setOwe(record.getRealReceivePay() - record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillOtherMapper.insert(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index b52ae5a75..406f1bbc2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -154,7 +154,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe Long addpay = wxBillDeposit.getPay(); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); - wxBillDeposit.setOwe(record.getRealReceivePay() - record.getPay()); + wxBillDeposit.setOwe(record.getReceivePay() - record.getPay()); if (record.getPay().equals(record.getReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date receiveDate = wxBillDeposit.getReceiveDate();