From 496d43fd95e9cbd288366dc8bd3cd9c8ae45ffb9 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 23 Apr 2021 14:10:17 +0800 Subject: [PATCH] fix cashout --- .../migration/V202104130001__for_cash_out.sql | 2 +- .../controller/WxCashOutController.java | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql index 03971a4bb..f9ce83aa7 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql @@ -39,7 +39,7 @@ UPDATE wx_mall SET cash_out_limit = 10 ; ALTER TABLE wx_merchant ADD COLUMN `cash_out_count` INT(3) DEFAULT 0 COMMENT '当日提现次数' ; ALTER TABLE wx_cash_out ADD COLUMN `phone` VARCHAR(20) NOT NULL COMMENT '提现的手机号' ; -ALTER TABLE wx_cash_out ADD COLUMN `wx_b_open_head_img` VARCHAR(100) COMMENT 'b端微信用户头像' ; +ALTER TABLE wx_cash_out ADD COLUMN `wx_b_open_head_img` VARCHAR(1000) COMMENT 'b端微信用户头像' ; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 392e2954a..436683e9e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -87,6 +87,10 @@ public class WxCashOutController extends BaseController { @GetMapping("getCurrentCashOutData") public ResultData getCurrentCashOutData() { WxMerchantBUser buser = getLoginBUser(); + WxCUser mUser = getCurrentCUser(buser); + if (mUser == null) { + return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。"); + } WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); Map resultMap = new HashMap(); @@ -94,19 +98,26 @@ public class WxCashOutController extends BaseController { resultMap.put("cashOutNumber", merchant.getCashOutNumber()); resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutLimit", mall.getCashOutLimit()); + resultMap.put("cashOutOpenNickName", mUser.getNickName()); + resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl()); return new ResultData(resultMap); } + private WxCUser getCurrentCUser(WxMerchantBUser buser) { + //当前管理员的账户必须在c端授权了 + WxCUser cuUser = new WxCUser(); + cuUser.updateTenantInfo(buser); + cuUser.setPhone(buser.getPhone()); + return wxCUserService.getByObject(cuUser); + } + @ApiOperation("微信B端提现") @PostMapping("cashout") public ResultData cashout(@RequestBody WxCashOut wxCashOut) { WxMerchantBUser buser = getLoginBUser(); //当前管理员的账户必须在c端授权了 - WxCUser cuUser = new WxCUser(); - cuUser.updateTenantInfo(buser); - cuUser.setPhone(buser.getPhone()); try { - WxCUser mUser = wxCUserService.getByObject(cuUser); + WxCUser mUser = getCurrentCUser(buser); if (mUser == null) { return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。"); }