|
|
@@ -76,14 +76,15 @@ func (self *UserController) CheckLogin() {
|
|
|
}
|
|
|
|
|
|
// 商户信息, 如果不是商户,则返回 0
|
|
|
- merchant_user_id := int64(0)
|
|
|
- if curUser != nil {
|
|
|
- merchant_user_id = curUser.Id
|
|
|
- }
|
|
|
- merchantUser := merchant_model.GetMerchantUserRelationByUserId(merchant_user_id, false) //一个商户对应多个用户
|
|
|
- if merchantUser != nil {
|
|
|
- userInfo.MerchantId = merchantUser.MerchantId
|
|
|
- }
|
|
|
+ /*
|
|
|
+ merchant_user_id := int64(0)
|
|
|
+ if curUser != nil {
|
|
|
+ merchant_user_id = curUser.Id
|
|
|
+ }
|
|
|
+ merchantUser := merchant_model.GetMerchantUserRelationByUserId(merchant_user_id, false) //一个商户对应多个用户
|
|
|
+ if merchantUser != nil {
|
|
|
+ userInfo.MerchantId = merchantUser.MerchantId
|
|
|
+ }*/
|
|
|
if wxUser != nil {
|
|
|
userInfo.Rank = wxUser.Rank
|
|
|
}
|