From 1a5cb29e74bdc8decca0c18cfca2f8f21ea337e4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 26 Apr 2021 14:55:57 +0800 Subject: [PATCH] fix cashout --- .../controller/WxCashOutController.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 4897c893f..c1d0e2def 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -120,7 +120,11 @@ public class WxCashOutController extends BaseController { if (!currentWxBUserIsAdmin(wxBUser,merchant)) { resultMap.put("cashOutSupport", 0); }else { - resultMap.put("cashOutSupport", mall.getCashOutSupport()); + if (!currentMerchantBUserIsAdmin(buser,merchant)) { + resultMap.put("cashOutSupport", 0); + }else { + resultMap.put("cashOutSupport", mall.getCashOutSupport()); + } } } resultMap.put("cashOutLimit", mall.getCashOutLimit()); @@ -146,6 +150,15 @@ public class WxCashOutController extends BaseController { } } + private boolean currentMerchantBUserIsAdmin(WxMerchantBUser wxBUser,WxMerchant merchant) { + if ((!StringUtils.isBlank(wxBUser.getPhone())) && wxBUser.getPhone().equals(merchant.getLinkPhone()) ) { + return true; + }else { + return false; + + } + } + @ApiOperation("微信B端提现") @PostMapping("cashout") public ResultData cashout(@RequestBody WxCashOut wxCashOut) { @@ -155,7 +168,9 @@ public class WxCashOutController extends BaseController { if (!currentWxBUserIsAdmin(wxBUser,merchant)) { return new ResultData(Result.ERROR,"当前微信绑定的手机号["+wxBUser.getPhone()+"]非商户的联系手机号"); } - + if (!currentMerchantBUserIsAdmin(buser,merchant)) { + return new ResultData(Result.ERROR,"当前登陆账号["+buser.getPhone()+"]非商户的联系手机号"); + } //当前管理员的账户必须在c端授权了 try { WxCUser mUser = getCurrentCUser(buser);