From b6d15d38b622fa7162fc8f8f1584a1a5541d922e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 23 Apr 2019 19:33:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E7=BC=B4=E6=AC=BE=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillDailyServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillDepositServiceImpl.java | 3 ++- .../iformall/service/impl/WxBillOtherDepositServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillOtherServiceImpl.java | 3 ++- .../service/impl/WxBillPropertyDepositServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxBillPropertyServiceImpl.java | 3 ++- .../java/com/iformall/service/impl/WxBillRentServiceImpl.java | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) 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 a8d3151d6..7af308f13 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -143,6 +143,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { if(wxBillDaily==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + Integer addpay = wxBillDaily.getPay(); wxBillDaily.setPayDate(record.getPayDate()); wxBillDaily.setPay(record.getPay()); wxBillDaily.setReceivePay(record.getReceivePay()); @@ -160,7 +161,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillDaily.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 433a0d55a..c867c8e41 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -128,6 +128,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { if(wxBillDeposit==null){ return new ResultData(ErrorCode.BILL_RENT_DEPOSIT_IS_NOT_FOUND); } + Integer addpay = wxBillDeposit.getPay(); wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); @@ -145,7 +146,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillDeposit.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 925b4c6d9..c6725b9eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -144,6 +144,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService if (wxBillOtherDeposit == null) { return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + Integer addpay = wxBillOtherDeposit.getPay(); wxBillOtherDeposit.setPayDate(record.getPayDate()); wxBillOtherDeposit.setPay(record.getPay()); wxBillOtherDeposit.setReceivePay(record.getReceivePay()); @@ -161,7 +162,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillOtherDeposit.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 e56ea3161..d83bcae33 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -143,6 +143,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { if(wxBillOther==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + Integer addpay = wxBillOther.getPay(); wxBillOther.setPayDate(record.getPayDate()); wxBillOther.setPay(record.getPay()); wxBillOther.setReceivePay(record.getReceivePay()); @@ -160,7 +161,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillOther.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 da40c0953..2cfc84163 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -128,6 +128,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe if(record==null){ return new ResultData(ErrorCode.BILL_PROPERTY_DEPOSIT_IS_NOT_FOUND); } + Integer addpay = wxBillDeposit.getPay(); wxBillDeposit.setPayDate(record.getPayDate()); wxBillDeposit.setPay(record.getPay()); wxBillDeposit.setReceivePay(record.getReceivePay()); @@ -145,7 +146,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillDeposit.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 38b96b2be..10e607476 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -127,6 +127,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { if(property==null){ return new ResultData(ErrorCode.BILL_PROPERTY_IS_NOT_FOUND); } + Integer addpay = property.getPay(); property.setRevenue(record.getRevenue()); property.setLatePayRatio(record.getLatePayRatio()); property.setLatePayTime(record.getLatePayTime()); @@ -147,7 +148,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(property.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId()); 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 d3503e063..594c16a95 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -127,6 +127,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { if(wxBillRent==null){ return new ResultData(ErrorCode.BILL_RENT_IS_NOT_FOUND); } + Integer addpay = wxBillRent.getPay(); wxBillRent.setRevenue(record.getRevenue()); wxBillRent.setLatePayRatio(record.getLatePayRatio()); wxBillRent.setLatePayTime(record.getLatePayTime()); @@ -147,7 +148,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillAction wxBillAction = new WxBillAction(); wxBillAction.setBillId(wxBillRent.getId()); String message = EnumBillPayWay.getEnum(record.getPayWay()).getMessage(); - String price = new BigDecimal(record.getPay()).divide(new BigDecimal(100)).toPlainString(); + String price = new BigDecimal(record.getPay() - addpay).divide(new BigDecimal(100)).toPlainString(); wxBillAction.setDetails(message + price + "元"); wxBillAction.setAction(EnumBillAction.OFFLINE_PAY.getCode()); wxBillAction.setUserId(user.getId());