From 31ab3f16c62e660ee82c268fc3566e58dda088cb Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 31 Dec 2023 22:56:32 +0800 Subject: [PATCH] fix --- .../iformall/service/WxCashOutService.java | 54 ------------------- .../service/impl/WxFlowServiceImpl.java | 28 ---------- 2 files changed, 82 deletions(-) delete mode 100644 yqzjService/src/main/java/com/iformall/service/WxCashOutService.java diff --git a/yqzjService/src/main/java/com/iformall/service/WxCashOutService.java b/yqzjService/src/main/java/com/iformall/service/WxCashOutService.java deleted file mode 100644 index 9fce75a..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCashOutService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumPayWay; -import com.iformall.exception.MallinkException; - -public interface WxCashOutService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxCashOut record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCashOut getById(Long id,String tenantId); - - /** - *更新状态 - * - * @param record - */ - void updateStatus(WxCashOut record); - - void createCashOut(WxCashOut record); - - ResultData applyCashout(WxMerchantBUser buser,WxCashOut record,WxMerchant merchant,EnumPayWay payWay); - - public void sendCashOutMsg(TenantEntity tenantEntity, Long cashOutId,EnumPayWay payWay); - - void rejectCashOut(WxCashOut record); - - void cashOutToWx(EnumPayWay payWay,TenantEntity tenantEntity, Long cashOutId); - - /** - * 失败的情况下,可以重复发起 - */ - ResultData reCashout(WxMerchantBUser buser,WxCashOut record,EnumPayWay payWay); - - void addCashOut(WxMerchant merchant,Integer amount) throws MallinkException; - -} diff --git a/yqzjService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/yqzjService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c01a0b3..8ce5308 100644 --- a/yqzjService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/yqzjService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -97,8 +97,6 @@ public class WxFlowServiceImpl implements WxFlowService { @Autowired @Qualifier("couponChannelRedisTemplate") RedisTemplate> cdRedisTemplate; - @Autowired - private WxCashOutService wxCashOutService; @Override public void wxFlowConfigInit(String tenantId) { @@ -463,32 +461,6 @@ public class WxFlowServiceImpl implements WxFlowService { 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); - - //如果是提交审批 - if (EnumRentContractAppStatus.APPLYING.getCode().intValue() == applyStatus.intValue()) { - cashout.setStatus(EnumCashOutStatus.AUDIOING.getCode()); - cashout.setUpdateDate(new Date()); - wxCashOutService.updateStatus(cashout); - // 审批完成 - }else if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { - cashout.setStatus(EnumCashOutStatus.WAITING.getCode()); - cashout.setUpdateDate(new Date()); - wxCashOutService.updateStatus(cashout); - //发送零钱提现通知 - String cashPayWay = (String)getVariableByKey(variables,"cashPayWay"); - wxCashOutService.sendCashOutMsg(cashout, cashout.getId(),EnumPayWay.getEnum(Integer.parseInt(cashPayWay))); - logger.info("cashout msg:"+cashout.getId()); - //如果是审批撤回,或者驳回,改回草稿状态 - }else if (EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() - || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { - cashout.setStatus(EnumCashOutStatus.REJECT.getCode()); - String remark = (String)mapInfo.get("remark"); - cashout.setAudioRemark(remark); - cashout.setAudioDate(new Date()); - cashout.setUpdateDate(new Date()); - wxCashOutService.rejectCashOut(cashout); - } } }