From 7012781cf512964e66cb5655945316a248108fa4 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 7 May 2024 21:13:53 +0800 Subject: [PATCH] fix --- .../service/impl/WxBillAllServiceImpl.java | 3 ++- .../service/impl/WxBillDailyServiceImpl.java | 20 +++++++++------ .../impl/WxBillOtherDepositServiceImpl.java | 15 +++++++---- .../service/impl/WxBillOtherServiceImpl.java | 15 +++++++---- .../impl/WxBillPropertyServiceImpl.java | 25 ++++++++++++------- .../impl/WxBillRentManageServiceImpl.java | 17 ++++++++----- .../service/impl/WxBillRentServiceImpl.java | 23 +++++++++++------ .../service/impl/WxBillSettleServiceImpl.java | 8 +++--- .../impl/WxPropertyContractServiceImpl.java | 9 ++++--- .../impl/WxRentContractServiceImpl.java | 15 +++++++---- 10 files changed, 96 insertions(+), 54 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 ae661b812..dc2ecc078 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -1860,7 +1860,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillDaily.setOwe("0"); }else { wxBillDaily.setReceivePay(newPrice); - wxBillDaily.setOwe(new BigDecimal(newPrice).add(new BigDecimal(dbBill.getServiceChargePay())).subtract(new BigDecimal(dbBill.getPay())).toPlainString()); + //wxBillDaily.setOwe(new BigDecimal(newPrice).add(new BigDecimal(dbBill.getServiceChargePay())).subtract(new BigDecimal(dbBill.getPay())).toPlainString()); + wxBillDaily.setOwe(new BigDecimal(newPrice).subtract(new BigDecimal(dbBill.getPay())).toPlainString()); if (newPrice.equals(dbBill.getPay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); } 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 70e20ea97..7e63f1686 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -153,7 +153,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe("0"); } else { - e.setOwe(realReceivePay.subtract(new BigDecimal(e.getPay())).toPlainString()); + //e.setOwe(realReceivePay.subtract(new BigDecimal(e.getPay())).toPlainString()); + e.setOwe(new BigDecimal(e.getReceivePay()).subtract(new BigDecimal(e.getPay())).toPlainString()); } } } @@ -210,7 +211,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { record.setId(id); record.updateTenantInfo(tenantEntity); WxBillDaily wxBillDaily = getBillRentPropertyList(1, 1, record, wxPayAccountBill).getList().get(0); - wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getRealReceivePay()).subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); + //wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getRealReceivePay()).subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); + wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getReceivePay()).subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); wxBillDaily.setMerchant(wxMerchantMapper.selectById(wxBillDaily.getMerchantId())); // if (wxBillDaily.getShopId() != null) { // WxShop shop = new WxShop(); @@ -225,7 +227,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { @Override public ResultData saveOrUpdate(WxBillDaily record, MallUserInfo user) { - String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + //String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + String receivepay = StringUtils.isBlank(record.getReceivePay()) ? "0" : record.getReceivePay(); String pay = StringUtils.isBlank(record.getPay()) ? "0" : record.getPay(); if(new BigDecimal(pay).compareTo(new BigDecimal(receivepay)) > 0 ){ return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); @@ -249,7 +252,8 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); - record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillDailyMapper.insert(record); @@ -269,14 +273,16 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { String message = ""; if(record.getServiceChargePayUpdate() != null){ wxBillDaily.setServiceChargePay(record.getServiceChargePayUpdate()); - wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getReceivePay()).add(new BigDecimal(wxBillDaily.getServiceChargePay())) - .subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); + //wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getReceivePay()).add(new BigDecimal(wxBillDaily.getServiceChargePay())) + // .subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); + wxBillDaily.setOwe(new BigDecimal(wxBillDaily.getReceivePay()).subtract(new BigDecimal(wxBillDaily.getPay())).toPlainString()); }else{ String addpay = wxBillDaily.getPay(); wxBillDaily.setPayDate(record.getPayDate()); wxBillDaily.setPay(record.getPay()); wxBillDaily.setReceivePay(record.getReceivePay()); - wxBillDaily.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //wxBillDaily.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + wxBillDaily.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); if (record.getPay().equals(record.getRealReceivePay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); 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 37c15e8f6..e9e71951c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -156,7 +156,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe("0"); } else { - e.setOwe(servicePay.add(new BigDecimal(e.getReceivePay())).subtract(new BigDecimal(e.getPay())).toPlainString()); + //e.setOwe(servicePay.add(new BigDecimal(e.getReceivePay())).subtract(new BigDecimal(e.getPay())).toPlainString()); + e.setOwe(new BigDecimal(e.getReceivePay()).subtract(new BigDecimal(e.getPay())).toPlainString()); } } } @@ -207,7 +208,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService record.setId(id); record.updateTenantInfo(tenantEntity); WxBillOtherDeposit wxBillOther = getBillRentPropertyList(1, 10000, record, wxPayAccountBill).getList().get(0); - wxBillOther.setOwe(new BigDecimal(wxBillOther.getRealReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + //wxBillOther.setOwe(new BigDecimal(wxBillOther.getRealReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + wxBillOther.setOwe(new BigDecimal(wxBillOther.getReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); // if (wxBillOther.getShopId() != null) { // WxShop shop = new WxShop(); @@ -254,7 +256,8 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); - record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillOtherDepositMapper.insert(record); @@ -273,13 +276,15 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService String price = ""; if(record.getServiceChargePayUpdate() != null){ wxBillOtherDeposit.setServiceChargePay(record.getServiceChargePayUpdate()); - wxBillOtherDeposit.setOwe(new BigDecimal(wxBillOtherDeposit.getReceivePay()).add(new BigDecimal(wxBillOtherDeposit.getServiceChargePay())).subtract(new BigDecimal(wxBillOtherDeposit.getPay())).toPlainString()); + //wxBillOtherDeposit.setOwe(new BigDecimal(wxBillOtherDeposit.getReceivePay()).add(new BigDecimal(wxBillOtherDeposit.getServiceChargePay())).subtract(new BigDecimal(wxBillOtherDeposit.getPay())).toPlainString()); + wxBillOtherDeposit.setOwe(new BigDecimal(wxBillOtherDeposit.getReceivePay()).subtract(new BigDecimal(wxBillOtherDeposit.getPay())).toPlainString()); }else{ String addpay = wxBillOtherDeposit.getPay(); wxBillOtherDeposit.setPayDate(record.getPayDate()); wxBillOtherDeposit.setPay(record.getPay()); wxBillOtherDeposit.setReceivePay(record.getReceivePay()); - wxBillOtherDeposit.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //wxBillOtherDeposit.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + wxBillOtherDeposit.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); if (record.getPay().equals(record.getRealReceivePay())) { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); 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 1e54193ac..6469103b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -156,7 +156,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe("0"); } else { - e.setOwe(servicePay.add(new BigDecimal(e.getReceivePay())).subtract(new BigDecimal(e.getPay())).toPlainString()); + //e.setOwe(servicePay.add(new BigDecimal(e.getReceivePay())).subtract(new BigDecimal(e.getPay())).toPlainString()); + e.setOwe(new BigDecimal(e.getReceivePay()).subtract(new BigDecimal(e.getPay())).toPlainString()); } } } @@ -207,7 +208,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setId(id); record.updateTenantInfo(tenantEntity); WxBillOther wxBillOther = getBillOtherPropertyList(1, 1, record, wxPayAccountBill).getList().get(0); - wxBillOther.setOwe(new BigDecimal(wxBillOther.getRealReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + //wxBillOther.setOwe(new BigDecimal(wxBillOther.getRealReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + wxBillOther.setOwe(new BigDecimal(wxBillOther.getReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); wxBillOther.setMerchant(wxMerchantMapper.selectById(wxBillOther.getMerchantId())); // if (wxBillOther.getShopId() != null) { // WxShop shop = new WxShop(); @@ -253,7 +255,8 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); - record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillOtherMapper.insert(record); @@ -273,13 +276,15 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { String price = ""; if(record.getServiceChargePayUpdate() != null){ wxBillOther.setServiceChargePay(record.getServiceChargePayUpdate()); - wxBillOther.setOwe(new BigDecimal(wxBillOther.getReceivePay()).add(new BigDecimal(wxBillOther.getServiceChargePay())).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + //wxBillOther.setOwe(new BigDecimal(wxBillOther.getReceivePay()).add(new BigDecimal(wxBillOther.getServiceChargePay())).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); + wxBillOther.setOwe(new BigDecimal(wxBillOther.getReceivePay()).subtract(new BigDecimal(wxBillOther.getPay())).toPlainString()); }else{ String addpay = wxBillOther.getPay(); wxBillOther.setPayDate(record.getPayDate()); wxBillOther.setPay(record.getPay()); wxBillOther.setReceivePay(record.getReceivePay()); - wxBillOther.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //wxBillOther.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + wxBillOther.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); if (record.getPay().equals(record.getRealReceivePay())) { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); 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 6c3a7bccb..407897e11 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -224,7 +224,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { e.setOwe("0"); } else { - e.setOwe(realReceivePay.subtract(new BigDecimal(e.getPay())).toPlainString()); + //e.setOwe(realReceivePay.subtract(new BigDecimal(e.getPay())).toPlainString()); + e.setOwe(new BigDecimal(e.getReceivePay()).subtract(new BigDecimal(e.getPay())).toPlainString()); } } } @@ -278,13 +279,15 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.updateTenantInfo(tenantEntity); PageInfo page = getBillPropertyList(1, 10000, wxPayAccountBill, record); WxBillProperty property = page.getList().get(0); - property.setOwe(new BigDecimal(property.getRealReceivePay()).subtract(new BigDecimal(property.getPay())).toPlainString()); + //property.setOwe(new BigDecimal(property.getRealReceivePay()).subtract(new BigDecimal(property.getPay())).toPlainString()); + property.setOwe(new BigDecimal(property.getReceivePay()).subtract(new BigDecimal(property.getPay())).toPlainString()); return property; } @Override public ResultData saveOrUpdate(WxBillProperty record, MallUserInfo user) { - String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + //String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + String receivepay = StringUtils.isBlank(record.getReceivePay()) ? "0" : record.getReceivePay(); String pay = StringUtils.isBlank(record.getPay()) ? "0" : record.getPay(); if (new BigDecimal(pay).compareTo(new BigDecimal(receivepay)) > 0 ) { return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); @@ -296,7 +299,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setId(idWorker.nextId()); record.setCreatetime(date); record.setUpdatetime(date); - record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); record.setIsDel(EnumDelStatus.NOT_DEL.getCode()); try { wxBillPropertyMapper.insert(record); @@ -317,8 +321,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { if (record.getServiceChargePayUpdate() != null) { property.setServiceChargePay(record.getServiceChargePayUpdate()); String latePayPrice = StringUtils.isBlank(property.getLatePayPrice()) ? "0" : property.getLatePayPrice(); - property.setOwe(new BigDecimal(property.getReceivePay()).add(new BigDecimal(latePayPrice)) - .add(new BigDecimal(property.getServiceChargePay())).subtract(new BigDecimal(property.getPay())).toPlainString()); + //property.setOwe(new BigDecimal(property.getReceivePay()).add(new BigDecimal(latePayPrice)) + // .add(new BigDecimal(property.getServiceChargePay())).subtract(new BigDecimal(property.getPay())).toPlainString()); + property.setOwe(new BigDecimal(property.getReceivePay()).subtract(new BigDecimal(property.getPay())).toPlainString()); } else { String addpay = property.getPay(); property.setRevenue(record.getRevenue()); @@ -328,7 +333,8 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setPayDate(record.getPayDate()); property.setPay(record.getPay()); property.setReceivePay(record.getReceivePay()); - property.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //property.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + property.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); if (record.getPay().equals(record.getRealReceivePay())) { property.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); @@ -494,8 +500,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { WxBillProperty property = wxBillPropertyMapper.selectById(record.getId()); if (record.getLatePayMoneyUpdate() != null) { property.setLatePayPrice(record.getLatePayMoneyUpdate()); - property.setOwe(new BigDecimal(property.getReceivePay()).add(new BigDecimal(property.getLatePayPrice())) - .add(new BigDecimal(property.getServiceChargePay())).subtract(new BigDecimal(property.getPay())).toPlainString()); + //property.setOwe(new BigDecimal(property.getReceivePay()).add(new BigDecimal(property.getLatePayPrice())) + // .add(new BigDecimal(property.getServiceChargePay())).subtract(new BigDecimal(property.getPay())).toPlainString()); + property.setOwe(new BigDecimal(property.getReceivePay()).subtract(new BigDecimal(property.getPay())).toPlainString()); final IdWorker idWorker = IdWorker.get(); WxBillAction billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 8c1bf32e1..2441347e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -162,7 +162,8 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { @Override public ResultData saveOrUpdate(WxBillRentManage record, MallUserInfo user) { - String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + //String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + String receivepay = StringUtils.isBlank(record.getReceivePay()) ? "0" : record.getReceivePay(); String pay = StringUtils.isBlank(record.getPay()) ? "0" : record.getPay(); if(new BigDecimal(pay).compareTo(new BigDecimal(receivepay)) > 0 ){ return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); @@ -194,8 +195,9 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { if(record.getServiceChargePayUpdate() != null){ wxBillRent.setServiceChargePay(record.getServiceChargePayUpdate()); String latePayPrice = StringUtils.isBlank(wxBillRent.getLatePayPrice()) ? "0" : wxBillRent.getLatePayPrice(); - wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(latePayPrice)).add(new BigDecimal(wxBillRent.getServiceChargePay())) - .subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + //wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(latePayPrice)).add(new BigDecimal(wxBillRent.getServiceChargePay())) + // .subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); }else{ String addpay = wxBillRent.getPay(); wxBillRent.setLatePayRatio(record.getLatePayRatio()); @@ -260,7 +262,8 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { record.updateTenantInfo(tenantEntity); PageInfo page = getBillRentManageList(1, 1, record, wxPayAccountBill); WxBillRentManage rentManage = page.getList().get(0); - rentManage.setOwe(new BigDecimal(rentManage.getRealReceivePay()).subtract(new BigDecimal(rentManage.getPay())).toPlainString()); + //rentManage.setOwe(new BigDecimal(rentManage.getRealReceivePay()).subtract(new BigDecimal(rentManage.getPay())).toPlainString()); + rentManage.setOwe(new BigDecimal(rentManage.getReceivePay()).subtract(new BigDecimal(rentManage.getPay())).toPlainString()); return rentManage; } @@ -288,7 +291,8 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { if (!rent.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { rent.setOwe("0"); } else { - rent.setOwe(realReceivePay.subtract(new BigDecimal(rent.getPay())).toPlainString()); + //rent.setOwe(realReceivePay.subtract(new BigDecimal(rent.getPay())).toPlainString()); + rent.setOwe(new BigDecimal(rent.getReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); } } } @@ -298,7 +302,8 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { WxBillRentManage rent = wxBillRentManageMapper.selectById(record.getId()); if(record.getLatePayMoneyUpdate() != null) { rent.setLatePayPrice(record.getLatePayMoneyUpdate()); - rent.setOwe(new BigDecimal(rent.getReceivePay()).add(new BigDecimal(rent.getLatePayPrice())).add(new BigDecimal(rent.getServiceChargePay())).subtract(new BigDecimal(rent.getPay())).toPlainString()); + //rent.setOwe(new BigDecimal(rent.getReceivePay()).add(new BigDecimal(rent.getLatePayPrice())).add(new BigDecimal(rent.getServiceChargePay())).subtract(new BigDecimal(rent.getPay())).toPlainString()); + rent.setOwe(new BigDecimal(rent.getReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); final IdWorker idWorker = IdWorker.get(); WxBillAction billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); 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 8685f9f7e..0ec8abe2b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -94,7 +94,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { if (!rent.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode())) { rent.setOwe("0"); } else { - rent.setOwe(realReceivePay.subtract(new BigDecimal(rent.getPay())).toPlainString()); + //rent.setOwe(realReceivePay.subtract(new BigDecimal(rent.getPay())).toPlainString()); + rent.setOwe(new BigDecimal(rent.getReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); } } } @@ -149,13 +150,15 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillRent rent = rp.getList().get(0); //手续费 = 合同应收+手续费+滞纳金 //computeTotalMoney(wxPayAccountBill, rent); - rent.setOwe(new BigDecimal(rent.getRealReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); + //rent.setOwe(new BigDecimal(rent.getRealReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); + rent.setOwe(new BigDecimal(rent.getReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); return rent; } @Override public ResultData saveOrUpdate(WxBillRent record, MallUserInfo user) { - String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + //String receivepay = StringUtils.isBlank(record.getRealReceivePay()) ? "0" : record.getRealReceivePay(); + String receivepay = StringUtils.isBlank(record.getReceivePay()) ? "0" : record.getReceivePay(); String pay = StringUtils.isBlank(record.getPay()) ? "0" : record.getPay(); if(new BigDecimal(pay).compareTo(new BigDecimal(receivepay)) > 0 ){ return new ResultData(ErrorCode.BILL_PAY_ERROR.getCode(), "实收金额不能大于实际应收总金额"); @@ -188,8 +191,9 @@ public class WxBillRentServiceImpl implements WxBillRentService { if(record.getServiceChargePayUpdate() != null){ wxBillRent.setServiceChargePay(record.getServiceChargePayUpdate()); String latePayPrice = StringUtils.isBlank(wxBillRent.getLatePayPrice()) ? "0" : wxBillRent.getLatePayPrice(); - wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(latePayPrice)) - .add(new BigDecimal(wxBillRent.getServiceChargePay())).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + //wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(latePayPrice)) + // .add(new BigDecimal(wxBillRent.getServiceChargePay())).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); }else{ String addpay = wxBillRent.getPay(); wxBillRent.setRevenue(record.getRevenue()); @@ -198,7 +202,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setLatePayStatus(record.getLatePayStatus()); wxBillRent.setPay(record.getPay()); wxBillRent.setReceivePay(record.getReceivePay()); - wxBillRent.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + //wxBillRent.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); + wxBillRent.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString()); if (record.getPay().equals(record.getRealReceivePay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); Date payDate = record.getPayDate(); @@ -389,7 +394,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { String newPrice = newReceivePay; wxBillRent.setUpdatetime(new Date()); String latePayPrice = StringUtils.isBlank(wxBillRent.getLatePayPrice()) ? "0" : wxBillRent.getLatePayPrice(); - wxBillRent.setOwe(new BigDecimal(newPrice).add(new BigDecimal(wxBillRent.getServiceChargePay())).add(new BigDecimal(latePayPrice)).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + //wxBillRent.setOwe(new BigDecimal(newPrice).add(new BigDecimal(wxBillRent.getServiceChargePay())).add(new BigDecimal(latePayPrice)).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); + wxBillRent.setOwe(new BigDecimal(newPrice).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString()); wxBillRentMapper.updateById(wxBillRent); if (!oldPrice.equals(newPrice)) { @@ -581,7 +587,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { WxBillRent rent = wxBillRentMapper.selectById(record.getId()); if(record.getLatePayMoneyUpdate() != null) { rent.setLatePayPrice(record.getLatePayMoneyUpdate()); - rent.setOwe(new BigDecimal(rent.getReceivePay()).add(new BigDecimal(rent.getLatePayPrice())).add(new BigDecimal(rent.getServiceChargePay())).subtract(new BigDecimal(rent.getPay())).toPlainString()); + //rent.setOwe(new BigDecimal(rent.getReceivePay()).add(new BigDecimal(rent.getLatePayPrice())).add(new BigDecimal(rent.getServiceChargePay())).subtract(new BigDecimal(rent.getPay())).toPlainString()); + rent.setOwe(new BigDecimal(rent.getReceivePay()).subtract(new BigDecimal(rent.getPay())).toPlainString()); final IdWorker idWorker = IdWorker.get(); WxBillAction billAction = new WxBillAction(); billAction.setId(idWorker.nextId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 4007fbf88..7d8b6810d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -364,7 +364,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { if(StringUtils.isBlank(dbBill.getPay())) dbBill.setPay("0"); if(StringUtils.isBlank(dbBill.getOwe())) dbBill.setOwe("0"); - wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe()); + wxBillRent.setPay(new BigDecimal(dbBill.getPay()).add(new BigDecimal(dbBill.getOwe())).toPlainString()); wxBillRent.setPayDate(new Date()); addBillAction(bill.getBillId(), String.valueOf(dbBill.getOwe())); } @@ -390,7 +390,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { if(StringUtils.isBlank(dbBill.getPay())) dbBill.setPay("0"); if(StringUtils.isBlank(dbBill.getReceivePay())) dbBill.setReceivePay("0"); - wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); + wxBillRent.setPay(new BigDecimal(dbBill.getPay()).add(new BigDecimal(dbBill.getReceivePay())).toPlainString()); wxBillRent.setPayDate(new Date()); if(EnumSettleBillType.R.getCode().equals(bill.getType())){ wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); @@ -429,7 +429,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { if(StringUtils.isBlank(dbBill.getPay())) dbBill.setPay("0"); if(StringUtils.isBlank(dbBill.getReceivePay())) dbBill.setReceivePay("0"); - wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); + wxBillRent.setPay(new BigDecimal(dbBill.getPay()).add(new BigDecimal(dbBill.getReceivePay())).toPlainString()); wxBillRent.setPayDate(new Date()); if(EnumSettleBillType.R.getCode().equals(bill.getType())){ wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); @@ -486,7 +486,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { if(StringUtils.isBlank(dbBill.getPay())) dbBill.setPay("0"); if(StringUtils.isBlank(dbBill.getOwe())) dbBill.setOwe("0"); - wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe()); + wxBillRent.setPay(new BigDecimal(dbBill.getPay()).add(new BigDecimal(dbBill.getOwe())).toPlainString()); wxBillRent.setPayDate(new Date()); addBillAction(bill.getBillId(), String.valueOf(dbBill.getOwe())); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 367ef563f..e1d228665 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -275,7 +275,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), record.getDecimalSize(), BigDecimal.ROUND_HALF_UP); bill.setServiceChargePay(servicePay.toPlainString()); - bill.setOwe(new BigDecimal(bill.getReceivePay()).add(new BigDecimal(bill.getServiceChargePay())).toPlainString()); + //bill.setOwe(new BigDecimal(bill.getReceivePay()).add(new BigDecimal(bill.getServiceChargePay())).toPlainString()); + bill.setOwe(new BigDecimal(bill.getReceivePay()).toPlainString()); count++; } wxBillPropertyMapper.insertBills(record.getPreviewBillRentList()); @@ -397,7 +398,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if(!haspreview){ if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null - && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals("0")) { //删除预账单,重新生成 wxBillPropertyMapper.deletePreviewBill(record); //重新生成 @@ -733,8 +734,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //计算手续费 BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); wxBillProperty.setServiceChargePay(servicePay.toPlainString()); - wxBillProperty.setOwe(new BigDecimal(wxBillProperty.getReceivePay()).add(new BigDecimal(wxBillProperty.getServiceChargePay())).toPlainString()); - + //wxBillProperty.setOwe(new BigDecimal(wxBillProperty.getReceivePay()).add(new BigDecimal(wxBillProperty.getServiceChargePay())).toPlainString()); + wxBillProperty.setOwe(new BigDecimal(wxBillProperty.getReceivePay()).toPlainString()); resultList.add(wxBillProperty); } //批量生成预账单 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index f6ec43e58..b5182e1f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -682,7 +682,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //计算手续费 BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), record.getDecimalSize(), BigDecimal.ROUND_HALF_UP); bill.setServiceChargePay(servicePay.toPlainString()); - bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay()); + //bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay()); + bill.setOwe(bill.getReceivePay()); count++; } wxBillRentMapper.insertBills(record.getPreviewBillRentList()); @@ -747,7 +748,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //计算手续费 BigDecimal servicePay = new BigDecimal(bill.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), record.getDecimalSize(), BigDecimal.ROUND_HALF_UP); bill.setServiceChargePay(servicePay.toPlainString()); - bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay()); + //bill.setOwe(bill.getReceivePay() + bill.getServiceChargePay()); + bill.setOwe(bill.getReceivePay()); count++; billList.add(bill); } @@ -1605,7 +1607,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { BigDecimal servicePay = new BigDecimal(wxBillRent.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())) .divide(new BigDecimal(10000), wxRentContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); wxBillRent.setServiceChargePay(servicePay.toPlainString()); - wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(wxBillRent.getServiceChargePay())).toPlainString()); + //wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).add(new BigDecimal(wxBillRent.getServiceChargePay())).toPlainString()); + wxBillRent.setOwe(new BigDecimal(wxBillRent.getReceivePay()).toPlainString()); resultList.add(wxBillRent); @@ -1645,7 +1648,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { //计算手续费 BigDecimal servicePay = new BigDecimal(needPay).multiply(new BigDecimal(serviceChargeRate)).divide(new BigDecimal(10000), decimalSize, BigDecimal.ROUND_HALF_UP); manage.setServiceChargePay(servicePay.toPlainString()); - manage.setOwe(new BigDecimal(needPay).add(new BigDecimal(manage.getServiceChargePay())).toPlainString()); + //manage.setOwe(new BigDecimal(needPay).add(new BigDecimal(manage.getServiceChargePay())).toPlainString()); + manage.setOwe(new BigDecimal(needPay).toPlainString()); return manage; } @@ -3308,7 +3312,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { br.setUpdatetime(new Date()); BigDecimal servicePay = new BigDecimal(br.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), wxRentContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP); br.setServiceChargePay(servicePay.toPlainString()); - br.setOwe(new BigDecimal(br.getReceivePay()).add(new BigDecimal(br.getServiceChargePay())).toPlainString()); + //br.setOwe(new BigDecimal(br.getReceivePay()).add(new BigDecimal(br.getServiceChargePay())).toPlainString()); + br.setOwe(new BigDecimal(br.getReceivePay()).toPlainString()); br.setComments("原金额["+oldNeedPay+"(分)]小于解单金额["+needPay+"(分)],系统自动更新"); wxBillRentMapper.updateById(br); }