From 75b18ab16ab4b3bf01446f01e33477768e9def3b Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 29 Jul 2024 00:34:35 +0800 Subject: [PATCH] fix --- .../com/iformall/service/impl/WxBillDailyServiceImpl.java | 6 +++++- .../com/iformall/service/impl/WxBillDepositServiceImpl.java | 6 +++++- .../service/impl/WxBillOtherDepositServiceImpl.java | 6 +++++- .../com/iformall/service/impl/WxBillOtherServiceImpl.java | 6 +++++- .../service/impl/WxBillPropertyDepositServiceImpl.java | 6 +++++- .../iformall/service/impl/WxBillPropertyServiceImpl.java | 6 +++++- .../iformall/service/impl/WxBillRentManageServiceImpl.java | 6 +++++- .../com/iformall/service/impl/WxBillRentServiceImpl.java | 6 +++++- 8 files changed, 40 insertions(+), 8 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 0ea2fe0d3..57c42ed17 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -642,7 +642,11 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillDailyMapper.updateById(wxBillRent); 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 5565e2962..e92aecc32 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -564,7 +564,11 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillDepositMapper.updateById(wxBillRent); 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 a4f22b09f..9363804ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -575,7 +575,11 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillOtherDepositMapper.updateById(wxBillRent); 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 bec9bbf7d..6b1e2cb91 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -518,7 +518,11 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillOtherMapper.updateById(wxBillRent); 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 f63566a52..3be2b1979 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -549,7 +549,11 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillPropertyDepositMapper.updateById(wxBillRent); 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 eb7b405ae..1a5dd61c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -682,7 +682,11 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillPropertyMapper.updateById(wxBillRent); 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 0e6d436b0..73ec2a71d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -595,7 +595,11 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillRentManageMapper.updateById(wxBillRent); 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 b95882a50..30ecbe3be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -789,7 +789,11 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); } } - wxBillRent.setSetOff(new BigDecimal(dbBill.getSetOff()).add(new BigDecimal(dto.getSetOff())).toPlainString()); + String oldSetOff = dbBill.getSetOff(); + if (StringUtils.isBlank(oldSetOff)) { + oldSetOff = "0"; + } + wxBillRent.setSetOff(new BigDecimal(oldSetOff).add(new BigDecimal(dto.getSetOff())).toPlainString()); wxBillRent.setPayDate(new Date()); wxBillRent.setPayWay(dto.getPayWayObject().getId()); wxBillRentMapper.updateById(wxBillRent);