From dce75571ce0ad957c56b57aa150bc286a98e81e6 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 22 Apr 2021 18:10:31 +0800 Subject: [PATCH] fix cashout --- .../controller/WxCashOutController.java | 22 +++++++++++++++++++ .../controller/WxMerchantBUserController.java | 4 ---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index ffdd11182..03d5f1df9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -10,6 +10,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.util.HashMap; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +34,10 @@ public class WxCashOutController extends BaseController { private WxCashOutService wxCashOutService; @Autowired WxCUserService wxCUserService; + @Autowired + WxMerchantService wxMerchantService; + @Autowired + WxMallService wxMallService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -44,6 +52,20 @@ public class WxCashOutController extends BaseController { final PageInfo page = wxCashOutService.listAsPage(wxCashOut, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("查询当前提现信息") + @GetMapping("getCurrentCashOutData") + public ResultData getCurrentCashOutData() { + WxMerchantBUser buser = getLoginBUser(); + WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); + WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); + Map resultMap = new HashMap(); + resultMap.put("cashOutCount", merchant.getCashOutCount()); + resultMap.put("cashOutNumber", merchant.getCashOutNumber()); + resultMap.put("cashOutSupport", mall.getCashOutSupport()); + resultMap.put("cashOutLimit", mall.getCashOutLimit()); + return new ResultData(resultMap); + } @ApiOperation("微信B端提现") @PostMapping("cashout") diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 5fd9ad10e..3ad9ed8be 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -98,10 +98,6 @@ public class WxMerchantBUserController extends BaseController { resultMap.put("merchant_id",merchant.getId()); resultMap.put("is_admin",merchant.getIsAdmin()); resultMap.put("businessId", merchant.getBusinessId()); - resultMap.put("cashOutCount", merchant.getCashOutCount()); - resultMap.put("cashOutNumber", merchant.getCashOutNumber()); - resultMap.put("cashOutSupport", mall.getCashOutSupport()); - resultMap.put("cashOutLimit", mall.getCashOutLimit()); String mid = null; try {