From c4ab01412b567d6903970dd1268d6fadd835be37 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Oct 2019 10:43:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillAllMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 0d64de599..72c14a7a0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -913,19 +913,19 @@ select bill.* from ( select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' - bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,shop_info,NULL + comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' - bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' - endtime,rent_shop_type,shop_info,NULL comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,shop_info,NULL + comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as bill_type,0 as - need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime, - rent_shop_type,'[]' shop_info,comments,'' price_detail,updatetime,freeze + need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,'[]' shop_info,comments,'' + price_detail,updatetime,freeze from wx_bill_other_deposit where tenant_id=#{tenantId} ) bill where 1=1 From be15f9393aee1c60be22e1155d9d3503d50c56b3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Oct 2019 10:56:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxBillAllMapper.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 72c14a7a0..05ec1fb77 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -913,19 +913,18 @@ select bill.* from ( select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' - bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,shop_info,NULL - comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where - tenant_id=#{tenantId} + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 + service_charge_pay + from wx_bill_rent_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' - bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,shop_info,NULL - comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where - tenant_id=#{tenantId} + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 + service_charge_pay + from wx_bill_property_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as - bill_type,0 as - need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,'[]' shop_info,comments,'' - price_detail,updatetime,freeze + bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 + late_pay_price,service_charge_pay from wx_bill_other_deposit where tenant_id=#{tenantId} ) bill where 1=1 From 08787e1c99b808442422c0e01ea129ea42717ab1 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Oct 2019 11:55:27 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E8=B4=A6=E5=8D=95[=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E6=AC=A0=E7=BC=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillAllServiceImpl.java | 53 ++++++++++--------- .../service/impl/WxBillRentServiceImpl.java | 3 +- .../main/resources/mapper/WxBillAllMapper.xml | 8 +-- 3 files changed, 34 insertions(+), 30 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 bd5ec20f4..4c907ecb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -156,28 +156,25 @@ public class WxBillAllServiceImpl implements WxBillAllService { } public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) { - if (!e.getBillTypeValue().equals(EnumBillTypeParam.RENT_DEPOSIT.getCode()) - && !e.getBillTypeValue().equals(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode())) { - if (e.getReceivePay() != null) { - if (e.getLatePayPrice() == null) { - e.setLatePayPrice(0L); - } - BigDecimal servicePay; - if (e.getServiceChargePay() != null) { - servicePay = new BigDecimal(e.getServiceChargePay()); - } else { - servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); - } - Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); - e.setRealReceivePay(realReceivePay); - e.setServiceChargePay(servicePay.intValue()); - if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode()) && - !e.getStatus().equals(EnumBillRentStatus.WAIT_PAY.getCode())) { - e.setOwe(0L); - } + if (e.getReceivePay() != null) { + if (e.getLatePayPrice() == null) { + e.setLatePayPrice(0L); + } + BigDecimal servicePay; + if (e.getServiceChargePay() != null) { + servicePay = new BigDecimal(e.getServiceChargePay()); + } else { + servicePay = new BigDecimal(e.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP); + } + Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); + e.setRealReceivePay(realReceivePay); + e.setServiceChargePay(servicePay.intValue()); + if (!e.getStatus().equals(EnumBillRentStatus.NOT_PAID.getCode()) && + !e.getStatus().equals(EnumBillRentStatus.WAIT_PAY.getCode())) { + e.setOwe(0L); + } else { + e.setOwe(realReceivePay - e.getPay()); } - } else { - e.setRealReceivePay(e.getReceivePay()); } } @@ -970,12 +967,14 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillRent.setUpdatetime(updateDate); if (oldLatePrice != null) { wxBillRent.setLatePayPrice(newLatePrice); + wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + newLatePrice - wxBillRent.getPay()); wxBillRentMapper.updateById(wxBillRent); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); } else { //租赁账单更新 wxBillRent.setReceivePay(newPrice); - wxBillRent.setOwe(newPrice - dbBill.getPay()); + long latePayPrice = wxBillRent.getLatePayPrice() == null ? 0 : wxBillRent.getLatePayPrice(); + wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + latePayPrice - dbBill.getPay()); if (newPrice.equals(dbBill.getPay())) { wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1023,11 +1022,13 @@ public class WxBillAllServiceImpl implements WxBillAllService { wxBillProperty.setUpdatetime(updateDate); if (oldLatePrice != null) { wxBillProperty.setLatePayPrice(newLatePrice); + wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + newLatePrice - wxBillProperty.getPay()); wxBillPropertyMapper.updateById(wxBillProperty); addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, id, oldLatePrice, newLatePrice, user); } else { wxBillProperty.setReceivePay(newPrice); - wxBillProperty.setOwe(newPrice - dbBill.getPay()); + long latePayPrice = wxBillProperty.getLatePayPrice() == null ? 0 : wxBillProperty.getLatePayPrice(); + wxBillProperty.setOwe(newPrice + wxBillProperty.getServiceChargePay() + latePayPrice - dbBill.getPay()); if (newPrice.equals(dbBill.getPay())) { wxBillProperty.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1070,7 +1071,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillOther wxBillOther = new WxBillOther(); wxBillOther.setId(id); wxBillOther.setReceivePay(newPrice); - wxBillOther.setOwe(newPrice - dbBill.getPay()); + wxBillOther.setOwe(newPrice + dbBill.getServiceChargePay() - dbBill.getPay()); if (newPrice.equals(dbBill.getPay())) { wxBillOther.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1084,7 +1085,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); wxBillOtherDeposit.setId(id); wxBillOtherDeposit.setReceivePay(newPrice); - wxBillOtherDeposit.setOwe(newPrice - dbBill.getPay()); + wxBillOtherDeposit.setOwe(newPrice + dbBill.getServiceChargePay() - dbBill.getPay()); if (newPrice.equals(dbBill.getPay())) { wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); } @@ -1550,7 +1551,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { WxBillDaily wxBillDaily = new WxBillDaily(); wxBillDaily.setId(businessId); wxBillDaily.setReceivePay(newPrice); - wxBillDaily.setOwe(newPrice - dbBill.getPay()); + wxBillDaily.setOwe(newPrice + dbBill.getServiceChargePay() - dbBill.getPay()); if (newPrice.equals(dbBill.getPay())) { wxBillDaily.setStatus(EnumBillRentStatus.PAID.getCode()); } 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 e6be60b48..2c4171d7d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -390,7 +390,8 @@ public class WxBillRentServiceImpl implements WxBillRentService { Long oldPrice = wxBillRent.getReceivePay(); Long newPrice = newReceivePay; wxBillRent.setUpdatetime(new Date()); - + long latePayPrice = wxBillRent.getLatePayPrice() == null ? 0 : wxBillRent.getLatePayPrice(); + wxBillRent.setOwe(newPrice + wxBillRent.getServiceChargePay() + latePayPrice - wxBillRent.getPay()); wxBillRentMapper.updateById(wxBillRent); if (!oldPrice.equals(newPrice)) { diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 05ec1fb77..f215e76e0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -41,6 +41,8 @@ + + @@ -912,17 +914,17 @@