|
|
|
@@ -94,7 +94,9 @@ public class BaseController { |
|
|
|
if (null != wxBuserId) { |
|
|
|
WxBuser buser = getWxBuser(); |
|
|
|
Long userId = buser.getUserId(); |
|
|
|
return getWxMerchantBUser(userId); |
|
|
|
WxMerchantBUser user = getWxMerchantBUser(userId); |
|
|
|
user.setBuserId(buser.getId()); |
|
|
|
return user; |
|
|
|
}else { |
|
|
|
Long userId = getMerchantBUserId(); |
|
|
|
return getWxMerchantBUser(userId); |
|
|
|
|