|
|
|
@@ -309,11 +309,17 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); |
|
|
|
wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); |
|
|
|
wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); |
|
|
|
|
|
|
|
//刚好结清 |
|
|
|
if(settle.getReceiveMoney().equals(settle.getPayMoney())){ |
|
|
|
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); |
|
|
|
} |
|
|
|
}else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { |
|
|
|
//解冻 |
|
|
|
wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),null); |
|
|
|
wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null); |
|
|
|
} |
|
|
|
|
|
|
|
wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -549,7 +555,7 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
public boolean isBill(Integer flowType){ |
|
|
|
if(EnumFlowKey.BILL.getCode().equals(flowType) |
|
|
|
||EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)){ |
|
|
|
return true; |
|
|
|
return true; |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
@@ -1516,4 +1522,10 @@ public class WxFlowServiceImpl implements WxFlowService { |
|
|
|
public List<WxFlowModel> getModelBybusiness(WxFlowModel wxFlowModel) { |
|
|
|
return wxFlowModelMapper.getModelBybusiness(wxFlowModel); |
|
|
|
} |
|
|
|
|
|
|
|
public static void main(String[] args) { |
|
|
|
new Thread(() -> System.out.println(1 + "hello world")).start(); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|