From 72362c715a37b452b1fb4e32396759e0e677fc24 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 26 Apr 2021 14:46:39 +0800 Subject: [PATCH] fix cashout --- .../controller/WxCashOutController.java | 20 +++++++++++++++---- 1 file changed, 16 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 5a32e7bd2..4897c893f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -116,7 +116,12 @@ public class WxCashOutController extends BaseController { if (payAccount.getShare().intValue() == EnumPayShare.YES.getCode().intValue()) { resultMap.put("cashOutSupport", 0); }else { - resultMap.put("cashOutSupport", mall.getCashOutSupport()); + WxBuser wxBUser = getWxBuser(); + if (!currentWxBUserIsAdmin(wxBUser,merchant)) { + resultMap.put("cashOutSupport", 0); + }else { + resultMap.put("cashOutSupport", mall.getCashOutSupport()); + } } resultMap.put("cashOutLimit", mall.getCashOutLimit()); resultMap.put("cashOutOpenNickName", mUser.getNickName()); @@ -132,15 +137,22 @@ public class WxCashOutController extends BaseController { return wxCUserService.getByObject(cuUser); } + private boolean currentWxBUserIsAdmin(WxBuser 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) { WxMerchantBUser buser = getLoginBUser(); WxBuser wxBUser = getWxBuser(); WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); - if ((!StringUtils.isBlank(wxBUser.getPhone())) && wxBUser.getPhone().equals(merchant.getLinkPhone()) ) { - //do nothing - }else { + if (!currentWxBUserIsAdmin(wxBUser,merchant)) { return new ResultData(Result.ERROR,"当前微信绑定的手机号["+wxBUser.getPhone()+"]非商户的联系手机号"); }