From 0be54a417c14ce05ffb49866c50dee873a1146dd Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 22 Apr 2021 18:43:47 +0800 Subject: [PATCH] fix cashout --- .../controller/WxCashOutController.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 632940dfa..0b30f66b6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; import io.swagger.annotations.Api; @@ -11,7 +12,9 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.slf4j.Logger; @@ -50,6 +53,30 @@ public class WxCashOutController extends BaseController { wxCashOut.updateTenantInfo(buser); wxCashOut.setMerchantId(buser.getMerchantId()); if (null != wxCashOut.getStatus() && wxCashOut.getStatus().intValue()<0) { + //提现中 + List statusList = new ArrayList(); + if (wxCashOut.getStatus().intValue()==99) { + statusList.add(EnumCashOutStatus.AUDIOING.getCode()); + statusList.add(EnumCashOutStatus.WAITING.getCode()); + wxCashOut.setStatusList(statusList); + //提现成功 + }else if (wxCashOut.getStatus().intValue()==98) { + statusList.add(EnumCashOutStatus.SUCCESS.getCode()); + wxCashOut.setStatusList(statusList); + //提现失败 + }else if (wxCashOut.getStatus().intValue()==97) { + statusList.add(EnumCashOutStatus.FAIL.getCode()); + statusList.add(EnumCashOutStatus.BACK.getCode()); + wxCashOut.setStatusList(statusList); + //提现拒绝 + }else if (wxCashOut.getStatus().intValue()==96) { + statusList.add(EnumCashOutStatus.REJECT.getCode()); + wxCashOut.setStatusList(statusList); + //审批中 + }else if (wxCashOut.getStatus().intValue()==96) { + statusList.add(EnumCashOutStatus.AUDIOING.getCode()); + wxCashOut.setStatusList(statusList); + } wxCashOut.setStatus(null); } final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize);