|
|
|
@@ -22,6 +22,7 @@ import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -135,6 +136,14 @@ public class WxCashOutController extends BaseController { |
|
|
|
@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 { |
|
|
|
return new ResultData(Result.ERROR,"当前微信绑定的手机号["+wxBUser.getPhone()+"]非商户的联系手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
//当前管理员的账户必须在c端授权了 |
|
|
|
try { |
|
|
|
WxCUser mUser = getCurrentCUser(buser); |
|
|
|
@@ -148,7 +157,7 @@ public class WxCashOutController extends BaseController { |
|
|
|
return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。"); |
|
|
|
} |
|
|
|
|
|
|
|
return wxCashOutService.applyCashout(buser, wxCashOut,EnumPayWay.PAY_WAY_WECHAT); |
|
|
|
return wxCashOutService.applyCashout(buser, wxCashOut,merchant,EnumPayWay.PAY_WAY_WECHAT); |
|
|
|
} |
|
|
|
|
|
|
|
// @ApiOperation("微信B端重新提现") |
|
|
|
|