| @@ -170,9 +170,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -187,9 +187,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillDepositMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -204,9 +204,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillOtherDeposit.setPay(dbBill.getReceivePay()); | |||||
| wxBillOtherDeposit.setPay(dbBill.getOwe()); | |||||
| wxBillOtherDeposit.setPayDate(new Date()); | wxBillOtherDeposit.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); | wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillOtherDeposit); | ||||
| @@ -221,9 +221,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| propertyDeposit.setPay(dbBill.getReceivePay()); | |||||
| propertyDeposit.setPay(dbBill.getOwe()); | |||||
| propertyDeposit.setPayDate(new Date()); | propertyDeposit.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | ||||
| @@ -239,9 +239,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillPropertyMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -256,9 +256,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| propertyDeposit.setPay(dbBill.getReceivePay()); | |||||
| propertyDeposit.setPay(dbBill.getOwe()); | |||||
| propertyDeposit.setPayDate(new Date()); | propertyDeposit.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); | ||||
| @@ -273,9 +273,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -290,9 +290,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -315,9 +315,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherDepositMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| @@ -332,9 +332,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); | WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillDaily.setPay(dbBill.getReceivePay()); | |||||
| wxBillDaily.setPay(dbBill.getOwe()); | |||||
| wxBillDaily.setPayDate(new Date()); | wxBillDaily.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | wxBillDailyMapper.updateByPrimaryKeySelective(wxBillDaily); | ||||
| @@ -349,9 +349,9 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { | |||||
| if(EnumBillRentStatus.PAID.getCode().equals(status)){ | if(EnumBillRentStatus.PAID.getCode().equals(status)){ | ||||
| WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); | WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); | ||||
| if(dbBill!=null) { | if(dbBill!=null) { | ||||
| wxBillRent.setPay(dbBill.getReceivePay()); | |||||
| wxBillRent.setPay(dbBill.getOwe()); | |||||
| wxBillRent.setPayDate(new Date()); | wxBillRent.setPayDate(new Date()); | ||||
| addBillAction(bill.getBillId(), dbBill.getReceivePay()); | |||||
| addBillAction(bill.getBillId(), dbBill.getOwe()); | |||||
| } | } | ||||
| } | } | ||||
| wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); | ||||