From 32c931e281fab7af42c02f940361e85704b32fa8 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 22 Oct 2019 13:30:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=90=84=E8=B4=A6=E5=8D=95=E4=BF=9D=E5=AD=98=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillAllServiceImpl.java | 4 ++-- .../iformall/service/impl/WxBillDailyServiceImpl.java | 8 ++++---- .../service/impl/WxBillDepositServiceImpl.java | 10 +++++----- .../service/impl/WxBillOtherDepositServiceImpl.java | 8 ++++---- .../iformall/service/impl/WxBillOtherServiceImpl.java | 2 +- .../service/impl/WxBillPropertyServiceImpl.java | 8 ++++---- .../iformall/service/impl/WxBillRentServiceImpl.java | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index ed8e186b7..9725055b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1710,7 +1710,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); + //WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getOweBillAsPage(record)); List> list = pageInfo.getList(); for (Map map : list) { @@ -1722,7 +1722,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { //加上手续费 //todo:把手续费率传进sql,在sql中算,汇总到max,直接出结果 - map.put("totalReceivePay", subZeroAndDot(map.get("totalOwe").toString())); + //map.put("totalReceivePay", subZeroAndDot(map.get("totalOwe").toString())); } pageInfo.setList(list); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 7a21d6f21..3b854f18b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -146,10 +146,10 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData saveOrUpdate(WxBillDaily 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.getCode(),"实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); } Date date = new Date(); if (record.getId() == null) { @@ -170,7 +170,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { 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 { wxBillDailyMapper.insert(record); @@ -197,7 +197,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDaily.setPay(record.getPay()); wxBillDaily.setReceivePay(record.getReceivePay()); wxBillDaily.setOwe(record.getRealReceivePay() - record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + if (record.getPay().equals(record.getRealReceivePay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); Date receiveDate = wxBillDaily.getReceiveDate(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index da83a50a4..b3c079dbf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -126,10 +126,10 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { @Override public ResultData saveOrUpdate(WxBillDeposit 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.getCode(), "实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); } Date date = new Date(); if (record.getId() == null) { @@ -138,7 +138,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { record.setId(idWorker.nextId()); record.setCreatetime(date); record.setUpdatetime(date); - record.setOwe(record.getReceivePay()-record.getPay()); + record.setOwe(record.getRealReceivePay() - record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillDepositMapper.insert(record); @@ -156,8 +156,8 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { Long addpay = wxBillDeposit.getPay(); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); - wxBillDeposit.setOwe(record.getReceivePay()-record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + wxBillDeposit.setOwe(record.getRealReceivePay() - record.getPay()); + if (record.getPay().equals(record.getRealReceivePay())) { wxBillDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date receiveDate = wxBillDeposit.getReceiveDate(); wxBillDeposit.setExpiredDay(0L); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index 39c260783..61acdcf97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -141,10 +141,10 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService @Override public ResultData saveOrUpdate(WxBillOtherDeposit 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.getCode(), "实收金额不能大于实际应收金额"); + return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); } Date date = new Date(); if (record.getId() == null) { @@ -167,7 +167,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService 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 { wxBillOtherDepositMapper.insert(record); @@ -193,7 +193,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService wxBillOtherDeposit.setPay(record.getPay()); wxBillOtherDeposit.setReceivePay(record.getReceivePay()); wxBillOtherDeposit.setOwe(record.getRealReceivePay() - record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + if (record.getPay().equals(record.getRealReceivePay())) { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); Date receiveDate = wxBillOtherDeposit.getReceiveDate(); 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 4d8f7c4a2..9745453e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -193,7 +193,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { wxBillOther.setPay(record.getPay()); wxBillOther.setReceivePay(record.getReceivePay()); wxBillOther.setOwe(record.getRealReceivePay() - record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + if (record.getPay().equals(record.getRealReceivePay())) { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); Date receiveDate = wxBillOther.getReceiveDate(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 42574d32e..c0f8b34e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -142,10 +142,10 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { @Override public ResultData saveOrUpdate(WxBillProperty record, MallUserInfo user) { - int receivepay = record.getReceivePay() == null ? 0 : record.getReceivePay().intValue(); + int receivepay = record.getRealReceivePay() == null ? 0 : record.getReceivePay().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) { @@ -154,7 +154,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setId(idWorker.nextId()); record.setCreatetime(date); record.setUpdatetime(date); - record.setOwe(record.getReceivePay() - record.getPay()); + record.setOwe(record.getRealReceivePay() - record.getPay()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillPropertyMapper.insert(record); @@ -185,7 +185,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setPay(record.getPay()); property.setReceivePay(record.getReceivePay()); property.setOwe(record.getRealReceivePay() - record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + if (record.getPay().equals(record.getRealReceivePay())) { property.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); Date receiveDate = property.getReceiveDate(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index ec3a05587..7c82b6519 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -144,10 +144,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { @Override public ResultData saveOrUpdate(WxBillRent 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) { @@ -186,7 +186,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setPay(record.getPay()); wxBillRent.setReceivePay(record.getReceivePay()); wxBillRent.setOwe(record.getRealReceivePay() - record.getPay()); - if (record.getPay().equals(record.getReceivePay())) { + if (record.getPay().equals(record.getRealReceivePay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); Date receiveDate = wxBillRent.getReceiveDate();