|
|
@@ -164,14 +164,14 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateFreezeOrStatus(List<WxBillSettleBill> billList,Integer freezeStatus,Integer status){ |
|
|
|
|
|
|
|
|
public void updateFreezeOrStatus(List<WxBillSettleBill> billList,Integer freezeStatus,Integer status,Integer applyStatus){ |
|
|
//1租金2押金3物业4日常费用6其他8补贴 |
|
|
//1租金2押金3物业4日常费用6其他8补贴 |
|
|
for (WxBillSettleBill bill:billList) { |
|
|
for (WxBillSettleBill bill:billList) { |
|
|
if(EnumBillQueryType.RENT.getCode().equals(bill.getBillType())) { |
|
|
if(EnumBillQueryType.RENT.getCode().equals(bill.getBillType())) { |
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -196,8 +196,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
}else if(EnumBillType.DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
WxBillDeposit wxBillRent = new WxBillDeposit(); |
|
|
WxBillDeposit wxBillRent = new WxBillDeposit(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -227,8 +227,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
wxBillOtherDeposit.setId(bill.getBillId()); |
|
|
wxBillOtherDeposit.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillOtherDeposit.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillOtherDeposit.setApplyStatus(applyStatus); |
|
|
wxBillOtherDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillOtherDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -258,8 +258,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(applyStatus); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -290,8 +290,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { |
|
|
}else if(EnumBillType.PROPERTY.getCode().equals(bill.getBillType())) { |
|
|
WxBillProperty wxBillRent = new WxBillProperty(); |
|
|
WxBillProperty wxBillRent = new WxBillProperty(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -316,8 +316,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(applyStatus); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -347,8 +347,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { |
|
|
}else if(EnumBillType.ROUTINE.getCode().equals(bill.getBillType())) { |
|
|
WxBillOther wxBillRent = new WxBillOther(); |
|
|
WxBillOther wxBillRent = new WxBillOther(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -373,8 +373,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); |
|
|
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -412,8 +412,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
}else if(EnumBillType.OTHER_DEPOSIT.getCode().equals(bill.getBillType())) { |
|
|
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); |
|
|
WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -443,8 +443,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
}else{ |
|
|
}else{ |
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
wxBillDaily.setId(bill.getBillId()); |
|
|
wxBillDaily.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillDaily.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillDaily.setApplyStatus(applyStatus); |
|
|
wxBillDaily.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillDaily.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -469,8 +469,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
WxBillOther wxBillRent = new WxBillOther(); |
|
|
WxBillOther wxBillRent = new WxBillOther(); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
wxBillRent.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
wxBillRent.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
wxBillRent.setApplyStatus(applyStatus); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
wxBillRent.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -495,8 +495,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
propertyDeposit.setId(bill.getBillId()); |
|
|
if ( null != bill.getApplyStatus()) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(bill.getApplyStatus()); |
|
|
|
|
|
|
|
|
if ( null != applyStatus) { |
|
|
|
|
|
propertyDeposit.setApplyStatus(applyStatus); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
propertyDeposit.setApplyUpdateTime(bill.getApplyUpdateTime()); |
|
|
} |
|
|
} |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
if (!StringUtils.isBlank(bill.getApplyPayImg())) { |
|
|
@@ -568,8 +568,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
if (record.getFlowParams() == null || record.getFlowParams().size() == 0) { |
|
|
if (record.getFlowParams() == null || record.getFlowParams().size() == 0) { |
|
|
record.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); |
|
|
record.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); |
|
|
//选择的账单改为已结清 |
|
|
//选择的账单改为已结清 |
|
|
updateFreezeOrStatus(record.getReceiveBillIds(), null,EnumBillRentStatus.PAID.getCode()); |
|
|
|
|
|
updateFreezeOrStatus(record.getPayBillIds(), null,EnumBillRentStatus.PAID.getCode()); |
|
|
|
|
|
|
|
|
updateFreezeOrStatus(record.getReceiveBillIds(), null,EnumBillRentStatus.PAID.getCode(),null); |
|
|
|
|
|
updateFreezeOrStatus(record.getPayBillIds(), null,EnumBillRentStatus.PAID.getCode(),null); |
|
|
|
|
|
|
|
|
//刚好结清 |
|
|
//刚好结清 |
|
|
if(record.getReceiveMoney().equals(record.getPayMoney())){ |
|
|
if(record.getReceiveMoney().equals(record.getPayMoney())){ |
|
|
@@ -602,8 +602,8 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { |
|
|
|
|
|
|
|
|
//改为冻结状态 |
|
|
//改为冻结状态 |
|
|
if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { |
|
|
if (record.getFlowParams() != null && record.getFlowParams().size() > 0) { |
|
|
updateFreezeOrStatus(record.getReceiveBillIds(), EnumFreezeType.YES.getCode(),null); |
|
|
|
|
|
updateFreezeOrStatus(record.getPayBillIds(),EnumFreezeType.YES.getCode(),null); |
|
|
|
|
|
|
|
|
updateFreezeOrStatus(record.getReceiveBillIds(), EnumFreezeType.YES.getCode(),null,null); |
|
|
|
|
|
updateFreezeOrStatus(record.getPayBillIds(),EnumFreezeType.YES.getCode(),null,null); |
|
|
|
|
|
|
|
|
//启动审批流 |
|
|
//启动审批流 |
|
|
record.getFlowParams().put("businessId",record.getId()); |
|
|
record.getFlowParams().put("businessId",record.getId()); |
|
|
|