|
|
|
@@ -169,7 +169,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillRent dbBill = wxBillRentMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getOwe()); |
|
|
|
wxBillRent.setPay(wxBillRent.getPay()+ dbBill.getOwe()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
} |
|
|
|
@@ -186,7 +186,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillDeposit dbBill = wxBillDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getReceivePay()); //押金是ReceivePay |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay() ); //押金是ReceivePay |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -204,7 +204,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillOtherDeposit.setPay(dbBill.getReceivePay()); |
|
|
|
wxBillOtherDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); |
|
|
|
wxBillOtherDeposit.setPayDate(new Date()); |
|
|
|
wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -222,7 +222,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
propertyDeposit.setPay(dbBill.getReceivePay()); |
|
|
|
propertyDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); |
|
|
|
propertyDeposit.setPayDate(new Date()); |
|
|
|
propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -241,7 +241,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillProperty dbBill = wxBillPropertyMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getOwe()); |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
} |
|
|
|
@@ -258,7 +258,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
propertyDeposit.setPay(dbBill.getReceivePay()); |
|
|
|
propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); |
|
|
|
propertyDeposit.setPayDate(new Date()); |
|
|
|
propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -276,7 +276,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getOwe()); |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
} |
|
|
|
@@ -293,7 +293,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getReceivePay()); |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -319,7 +319,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillOtherDeposit dbBill = wxBillOtherDepositMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getReceivePay()); |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
@@ -337,7 +337,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillDaily dbBill = wxBillDailyMapper.selectByPrimaryKey(wxBillDaily.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillDaily.setPay(dbBill.getOwe()); |
|
|
|
wxBillDaily.setPay(dbBill.getPay()+dbBill.getOwe()); |
|
|
|
wxBillDaily.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
} |
|
|
|
@@ -354,7 +354,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
if(EnumBillRentStatus.PAID.getCode().equals(status)){ |
|
|
|
WxBillOther dbBill = wxBillOtherMapper.selectByPrimaryKey(wxBillRent.getId()); |
|
|
|
if(dbBill!=null) { |
|
|
|
wxBillRent.setPay(dbBill.getOwe()); |
|
|
|
wxBillRent.setPay(dbBill.getPay()+dbBill.getOwe()); |
|
|
|
wxBillRent.setPayDate(new Date()); |
|
|
|
addBillAction(bill.getBillId(), dbBill.getOwe()); |
|
|
|
} |
|
|
|
|