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 38cefc174..2237259e7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -94,8 +94,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxRentContractMapper wxRentContractMapper; @Autowired private WxBillSettleMapper wxBillSettleMapper; - @Autowired - private WxBillSettleService wxBillSettleService; + //@Autowired + //private WxBillSettleService wxBillSettleService; @Autowired private WxRefundOrderService wxRefundOrderService; @Autowired @@ -359,7 +359,7 @@ public class WxFlowServiceImpl implements WxFlowService { settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode()); settleBill.setApplyUpdateTime(new Date()); billList.add(settleBill); - wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.PASSED.getCode()); + //wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.PASSED.getCode()); }else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) { //账单修改金额,冻结 List billList = new ArrayList<>(); @@ -373,7 +373,7 @@ public class WxFlowServiceImpl implements WxFlowService { settleBill.setApplyStatus(EnumBillRentApplyStatus.APPLYING.getCode()); settleBill.setApplyUpdateTime(new Date()); billList.add(settleBill); - wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null,EnumBillRentApplyStatus.APPLYING.getCode()); + //wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.YES.getCode(),null,EnumBillRentApplyStatus.APPLYING.getCode()); }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { //账单修改金额,解冻 List billList = new ArrayList<>(); @@ -383,7 +383,7 @@ public class WxFlowServiceImpl implements WxFlowService { settleBill.setApplyStatus(EnumBillRentApplyStatus.REJECT.getCode()); settleBill.setApplyUpdateTime(new Date()); billList.add(settleBill); - wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.REJECT.getCode()); + //wxBillSettleService.updateFreezeOrStatus(billList,EnumFreezeType.DEF.getCode(),null,EnumBillRentApplyStatus.REJECT.getCode()); } } else if (EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType) @@ -451,22 +451,22 @@ public class WxFlowServiceImpl implements WxFlowService { wxBillSettle.setApplyStatus(applyStatus); //审批完成,账单解冻 - WxBillSettle settle = wxBillSettleService.getById(Long.parseLong(businessId), EnumFilterSettle.NO.getCode()); - if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { - wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); - wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillStatus.PAID.getCode(),null); - wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillStatus.PAID.getCode(),null); - - //刚好结清 - 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,null); - wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null,null); - } - wxBillSettleMapper.updateById(wxBillSettle); +// WxBillSettle settle = wxBillSettleService.getById(Long.parseLong(businessId), EnumFilterSettle.NO.getCode()); +// if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { +// wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); +// wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillStatus.PAID.getCode(),null); +// wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillStatus.PAID.getCode(),null); +// +// //刚好结清 +// 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,null); +// wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null,null); +// } +// wxBillSettleMapper.updateById(wxBillSettle); }else if (EnumFlowKey.CASH_OUT.getCode().equals(flowType)) { String tenantId = (String)getVariableByKey(variables,"cashTenantId"); WxCashOut cashout = wxCashOutService.getById(Long.parseLong(businessId), tenantId);