diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 48ad4eae4..17ffefac5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -188,7 +188,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay() ); //押金是ReceivePay wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -206,7 +210,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillOtherDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); wxBillOtherDeposit.setPayDate(new Date()); - wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -224,7 +232,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -260,7 +272,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -295,7 +311,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -321,7 +341,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -373,7 +397,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index d3e272415..40b9abb20 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -1,214 +1,214 @@ - - - + + + - - - - - - + + + + + + - - - - + + + + - + - + `id`,`tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type` ,`createtime`,`updatetime` - - where 1=1 - and `id` = #{id} - and `tenant_id` = #{tenantId} - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - + + where 1=1 + and `id` = #{id} + and `tenant_id` = #{tenantId} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + delete from wx_bill_settle_bill where settle_id = #{id} - +