From 04db92a4a49804e8f6560a63e97d3faea8929d62 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 17 Sep 2019 00:40:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillSettleServiceImpl.java | 6 ++++++ .../iformall/service/impl/WxFlowServiceImpl.java | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 e458926d0..116277dab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -477,6 +477,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //选择的账单改为已结清 updateFreezeOrStatus(record.getReceiveBillIds(), null,EnumBillRentStatus.PAID.getCode()); updateFreezeOrStatus(record.getPayBillIds(), null,EnumBillRentStatus.PAID.getCode()); + + //刚好结清 + if(record.getReceiveMoney().equals(record.getPayMoney())){ + record.setStatus(EnumSettleStatus.FINISH.getCode()); + } } if (record.getId() == null) { record.setId(idWorker.nextId()); @@ -543,3 +548,4 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } } + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index f7a549cee..6b1e9be95 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -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 getModelBybusiness(WxFlowModel wxFlowModel) { return wxFlowModelMapper.getModelBybusiness(wxFlowModel); } + + public static void main(String[] args) { + new Thread(() -> System.out.println(1 + "hello world")).start(); + + } } +