| @@ -94,8 +94,8 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| private WxRentContractMapper wxRentContractMapper; | private WxRentContractMapper wxRentContractMapper; | ||||
| @Autowired | @Autowired | ||||
| private WxBillSettleMapper wxBillSettleMapper; | private WxBillSettleMapper wxBillSettleMapper; | ||||
| @Autowired | |||||
| private WxBillSettleService wxBillSettleService; | |||||
| //@Autowired | |||||
| //private WxBillSettleService wxBillSettleService; | |||||
| @Autowired | @Autowired | ||||
| private WxRefundOrderService wxRefundOrderService; | private WxRefundOrderService wxRefundOrderService; | ||||
| @Autowired | @Autowired | ||||
| @@ -359,7 +359,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode()); | settleBill.setApplyStatus(EnumBillRentApplyStatus.PASSED.getCode()); | ||||
| settleBill.setApplyUpdateTime(new Date()); | settleBill.setApplyUpdateTime(new Date()); | ||||
| billList.add(settleBill); | 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()) { | }else if(EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) { | ||||
| //账单修改金额,冻结 | //账单修改金额,冻结 | ||||
| List<WxBillSettleBill> billList = new ArrayList<>(); | List<WxBillSettleBill> billList = new ArrayList<>(); | ||||
| @@ -373,7 +373,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| settleBill.setApplyStatus(EnumBillRentApplyStatus.APPLYING.getCode()); | settleBill.setApplyStatus(EnumBillRentApplyStatus.APPLYING.getCode()); | ||||
| settleBill.setApplyUpdateTime(new Date()); | settleBill.setApplyUpdateTime(new Date()); | ||||
| billList.add(settleBill); | 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()) { | }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { | ||||
| //账单修改金额,解冻 | //账单修改金额,解冻 | ||||
| List<WxBillSettleBill> billList = new ArrayList<>(); | List<WxBillSettleBill> billList = new ArrayList<>(); | ||||
| @@ -383,7 +383,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| settleBill.setApplyStatus(EnumBillRentApplyStatus.REJECT.getCode()); | settleBill.setApplyStatus(EnumBillRentApplyStatus.REJECT.getCode()); | ||||
| settleBill.setApplyUpdateTime(new Date()); | settleBill.setApplyUpdateTime(new Date()); | ||||
| billList.add(settleBill); | 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) | } else if (EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType) | ||||
| || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType) | || EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType) | ||||
| @@ -451,22 +451,22 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| wxBillSettle.setApplyStatus(applyStatus); | 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)) { | }else if (EnumFlowKey.CASH_OUT.getCode().equals(flowType)) { | ||||
| String tenantId = (String)getVariableByKey(variables,"cashTenantId"); | String tenantId = (String)getVariableByKey(variables,"cashTenantId"); | ||||
| WxCashOut cashout = wxCashOutService.getById(Long.parseLong(businessId), tenantId); | WxCashOut cashout = wxCashOutService.getById(Long.parseLong(businessId), tenantId); | ||||