| @@ -642,7 +642,11 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillDailyMapper.updateById(wxBillRent); | wxBillDailyMapper.updateById(wxBillRent); | ||||
| @@ -564,7 +564,11 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillDepositMapper.updateById(wxBillRent); | wxBillDepositMapper.updateById(wxBillRent); | ||||
| @@ -575,7 +575,11 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillOtherDepositMapper.updateById(wxBillRent); | wxBillOtherDepositMapper.updateById(wxBillRent); | ||||
| @@ -518,7 +518,11 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillOtherMapper.updateById(wxBillRent); | wxBillOtherMapper.updateById(wxBillRent); | ||||
| @@ -549,7 +549,11 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillPropertyDepositMapper.updateById(wxBillRent); | wxBillPropertyDepositMapper.updateById(wxBillRent); | ||||
| @@ -682,7 +682,11 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillPropertyMapper.updateById(wxBillRent); | wxBillPropertyMapper.updateById(wxBillRent); | ||||
| @@ -595,7 +595,11 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillRentManageMapper.updateById(wxBillRent); | wxBillRentManageMapper.updateById(wxBillRent); | ||||
| @@ -789,7 +789,11 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe | |||||
| sb.append(";【系统】账单已付金额已大于等于实际应付金额,自动归结为结清。"); | 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.setPayDate(new Date()); | ||||
| wxBillRent.setPayWay(dto.getPayWayObject().getId()); | wxBillRent.setPayWay(dto.getPayWayObject().getId()); | ||||
| wxBillRentMapper.updateById(wxBillRent); | wxBillRentMapper.updateById(wxBillRent); | ||||