|
|
|
@@ -122,9 +122,9 @@ public class WxCashOutController extends BaseController { |
|
|
|
//}else { |
|
|
|
resultMap.put("cashOutSupport", mall.getCashOutSupport()); |
|
|
|
if (1 == mall.getCashOutSupport().intValue()) { |
|
|
|
WxCUser mUser = getCurrentCUser(buser); |
|
|
|
WxCUser mUser = getCurrentCUser(merchant); |
|
|
|
if (mUser == null) { |
|
|
|
return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。"); |
|
|
|
return new ResultData(Result.ERROR,"请用绑定["+merchant.getLinkPhone()+"]的微信在C端完成授权手机号操作。"); |
|
|
|
} |
|
|
|
resultMap.put("cashOutOpenNickName", mUser.getNickName()); |
|
|
|
resultMap.put("cashOutOpenHeadImg", mUser.getAvatarUrl()); |
|
|
|
@@ -136,11 +136,11 @@ public class WxCashOutController extends BaseController { |
|
|
|
return new ResultData(resultMap); |
|
|
|
} |
|
|
|
|
|
|
|
private WxCUser getCurrentCUser(WxMerchantBUser buser) { |
|
|
|
private WxCUser getCurrentCUser(WxMerchant merchant) { |
|
|
|
//当前管理员的账户必须在c端授权了 |
|
|
|
WxCUser cuUser = new WxCUser(); |
|
|
|
cuUser.updateTenantInfo(buser); |
|
|
|
cuUser.setPhone(buser.getPhone()); |
|
|
|
cuUser.updateTenantInfo(merchant); |
|
|
|
cuUser.setPhone(merchant.getLinkPhone()); |
|
|
|
return wxCUserService.getByObject(cuUser); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -176,9 +176,9 @@ public class WxCashOutController extends BaseController { |
|
|
|
// } |
|
|
|
//当前管理员的账户必须在c端授权了 |
|
|
|
try { |
|
|
|
WxCUser mUser = getCurrentCUser(buser); |
|
|
|
WxCUser mUser = getCurrentCUser(merchant); |
|
|
|
if (mUser == null) { |
|
|
|
return new ResultData(Result.ERROR,"请用绑定["+buser.getPhone()+"]的微信在C端完成授权手机号操作。"); |
|
|
|
return new ResultData(Result.ERROR,"请用绑定["+merchant.getLinkPhone()+"]的微信在C端完成授权手机号操作。"); |
|
|
|
} |
|
|
|
wxCashOut.setReciveOpenId(mUser.getOpenId()); |
|
|
|
wxCashOut.setReciveNickName(mUser.getNickName()); |
|
|
|
|