Просмотр исходного кода

fix cashout

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
496d43fd95
2 измененных файлов: 16 добавлений и 5 удалений
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql
  2. +15
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java

+ 1
- 1
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_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 `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端微信用户头像' ;







+ 15
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Просмотреть файл

@@ -87,6 +87,10 @@ public class WxCashOutController extends BaseController {
@GetMapping("getCurrentCashOutData") @GetMapping("getCurrentCashOutData")
public ResultData getCurrentCashOutData() { public ResultData getCurrentCashOutData() {
WxMerchantBUser buser = getLoginBUser(); WxMerchantBUser buser = getLoginBUser();
WxCUser mUser = getCurrentCUser(buser);
if (mUser == null) {
return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。");
}
WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId());
WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); WxMall mall = wxMallService.getByTenantId(buser.getTenantId());
Map<String,Object> resultMap = new HashMap<String,Object>(); Map<String,Object> resultMap = new HashMap<String,Object>();
@@ -94,19 +98,26 @@ public class WxCashOutController extends BaseController {
resultMap.put("cashOutNumber", merchant.getCashOutNumber()); resultMap.put("cashOutNumber", merchant.getCashOutNumber());
resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutSupport", mall.getCashOutSupport());
resultMap.put("cashOutLimit", mall.getCashOutLimit()); resultMap.put("cashOutLimit", mall.getCashOutLimit());
resultMap.put("cashOutOpenNickName", mUser.getNickName());
resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl());
return new ResultData(resultMap); 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端提现") @ApiOperation("微信B端提现")
@PostMapping("cashout") @PostMapping("cashout")
public ResultData cashout(@RequestBody WxCashOut wxCashOut) { public ResultData cashout(@RequestBody WxCashOut wxCashOut) {
WxMerchantBUser buser = getLoginBUser(); WxMerchantBUser buser = getLoginBUser();
//当前管理员的账户必须在c端授权了 //当前管理员的账户必须在c端授权了
WxCUser cuUser = new WxCUser();
cuUser.updateTenantInfo(buser);
cuUser.setPhone(buser.getPhone());
try { try {
WxCUser mUser = wxCUserService.getByObject(cuUser);
WxCUser mUser = getCurrentCUser(buser);
if (mUser == null) { if (mUser == null) {
return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。"); return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。");
} }


Загрузка…
Отмена
Сохранить