Merge branch 'refs/heads/XxY' into develop

handler/get_user_info.go

@@ -0,0 +1,63 @@
+package handler
+
+import (
+	"youngee_b_api/consts"
+	"youngee_b_api/model/http_model"
+	"youngee_b_api/service"
+	"youngee_b_api/util"
+
+	"github.com/gin-gonic/gin"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
+)
+
+func WrapGetUserInfoHandler(ctx *gin.Context) {
+	handler := newGetUserInfoHandler(ctx)
+	baseRun(handler)
+}
+
+func newGetUserInfoHandler(ctx *gin.Context) *GetUserInfoHandler {
+	return &GetUserInfoHandler{
+		req:  http_model.NewGetUserInfoRequest(),
+		resp: http_model.NewGetUserInfoResponse(),
+		ctx:  ctx,
+	}
+}
+
+type GetUserInfoHandler struct {
+	req  *http_model.GetUserInfoRequest
+	resp *http_model.CommonResponse
+	ctx  *gin.Context
+}
+
+func (h *GetUserInfoHandler) getRequest() interface{} {
+	return h.req
+}
+
+func (h *GetUserInfoHandler) getContext() *gin.Context {
+	return h.ctx
+}
+
+func (h *GetUserInfoHandler) getResponse() interface{} {
+	return h.resp
+}
+
+func (h *GetUserInfoHandler) run() {
+	userData, err := service.BUserInfo.FindBUserInfoByToken(h.ctx, h.req.Token)
+	if err != nil {
+		logrus.Errorf("[CodeLoginHandler] call AuthCode err:%+v\n", err)
+		util.HandlerPackErrorResp(h.resp, consts.ErrorInternal, err.Error())
+		log.Info("login fail,req:%+v", h.req)
+		return
+	}
+	var data *http_model.GetUserInfoData
+	data = userData
+	h.resp.Message = "成功查询用户信息"
+	h.resp.Data = data
+	h.resp.Status = 20000
+	return
+}
+
+func (h *GetUserInfoHandler) checkParam() error {
+	return nil
+}

model/gorm_model/user.go

@@ -10,7 +10,7 @@ type YounggeeUser struct {
 	Username      string    `gorm:"column:username"`                      // 后台用户名
 	Password      string    `gorm:"column:password"`                      // 用户密码
 	RealName      string    `gorm:"column:real_name"`                     // 真实姓名
-	Role          string    `gorm:"column:role"`                          // 角色 1，超级管理员； 2，管理员；3，企业用户
+	Role          string    `gorm:"column:role"`                          // 角色 1，超级管理员； 2，管理员；3，企业用户; 4. 企业子账号；5. 管理后台子账号；6.服务商账号；7.服务商子账号
 	Phone         string    `gorm:"column:phone"`                         // 绑定手机
 	Email         string    `gorm:"column:email"`                         // 电子邮件
 	LastLoginTime time.Time `gorm:"column:last_login_time"`               // 最后一次登录时间

model/http_model/get_user_info.go

@@ -0,0 +1,21 @@
+package http_model
+
+type GetUserInfoRequest struct {
+	Token string `json:"token"` // Token
+}
+
+type GetUserInfoData struct {
+	Role         string `json:"role"`           // 角色类型 1，超级管理员； 2，管理员；3，企业用户; 4. 企业子账号；5. 管理后台子账号
+	UserId       int64  `json:"user_id"`        // YG用户ID
+	EnterpriseId string `json:"enterprise_id"`  // 商家ID
+	SubAccountId int    `json:"sub_account_id"` // 子账号ID
+}
+
+func NewGetUserInfoRequest() *GetUserInfoRequest {
+	return new(GetUserInfoRequest)
+}
+func NewGetUserInfoResponse() *CommonResponse {
+	resp := new(CommonResponse)
+	resp.Data = new(GetUserInfoData)
+	return resp
+}

model/http_model/product_find.go

@@ -6,8 +6,9 @@ type FindProductRequest struct {
 
 type ProductPhoto struct {
 	PhotoUrl string `json:"photo_url"` // 图片或视频url
-	PhotoUid string `json:"photo_uid"`
-	Symbol   int64  `json:"symbol"` // 图片为主图或详情图标志位
+	PhotoUid string `json:"photo_uid"` // 图片Uid
+	Symbol   int64  `json:"symbol"`    // 图片为主图或详情图标志位
+	Name     string `json:"name"`      // 图片名称
 }
 
 type FindProductData struct {

route/init.go

@@ -22,6 +22,7 @@ func InitRoute(r *gin.Engine) {
 		business.POST("/deleteJob", handler.WrapdeleteJobHandler)               // 商家删除岗位
 		business.POST("/sendCode", handler.WrapSendCodeHandler)                 // 发送登录验证码
 		business.POST("/login", handler.WrapCodeLoginHandler)                   // 商家登录
+		business.POST("/getUserInfo", handler.WrapGetUserInfoHandler)           // 商家新增岗位
 		business.GET("/test/ping", func(c *gin.Context) {
 			resp := http_model.CommonResponse{
 				Status:  20000,

service/b_user_info.go

@@ -0,0 +1,42 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	log "github.com/sirupsen/logrus"
+	"youngee_b_api/db"
+	"youngee_b_api/model/http_model"
+)
+
+var BUserInfo *bUserInfo
+
+type bUserInfo struct {
+}
+
+// FindBUserInfoByToken 根据Token查询商家端用户信息
+func (*bUserInfo) FindBUserInfoByToken(ctx context.Context, token string) (*http_model.GetUserInfoData, error) {
+	if token != "" {
+		if auth, err := LoginAuth.AuthToken(ctx, token); err == nil {
+			var userInfo *http_model.GetUserInfoData
+			userInfo = &http_model.GetUserInfoData{
+				EnterpriseId: auth.EnterpriseID,
+				UserId:       auth.ID,
+				Role:         auth.Role,
+			}
+			if auth.Role == "3" {
+				fmt.Println("EnterpriseUser")
+			} else if auth.Role == "4" {
+				subaccountInfo, subaccountErr := db.FindSubAccountByPhone(ctx, auth.Phone)
+				if subaccountErr != nil {
+					return nil, subaccountErr
+				}
+				userInfo.SubAccountId = subaccountInfo.SubAccountId
+			}
+			return userInfo, nil
+		} else {
+			log.Infof("[LoginAuthMiddleware] auth fail,err:%+v", err)
+			return nil, err
+		}
+	}
+	return nil, nil
+}

service/product.go

@@ -6,6 +6,7 @@ import (
 	"github.com/lin-jim-leon/kuaishou"
 	"math/rand"
 	"strconv"
+	"strings"
 	"time"
 	"youngee_b_api/consts"
 	"youngee_b_api/db"
@@ -216,8 +217,16 @@ func (*product) QueryKuaishouProduct(ctx context.Context, newKuaishouProduct htt
 	// 5.1. 主图
 	var currProductMainPhoto *http_model.ProductPhoto
 	rand.Seed(time.Now().UnixNano())
+	currLastIndex := strings.LastIndex(findKuaishouProductData.KuaishouMainPhoto, "/")
+	var currDesiredFileName string
+	if currLastIndex != -1 {
+		currDesiredFileName = findKuaishouProductData.KuaishouMainPhoto[currLastIndex+1:]
+	} else {
+		currDesiredFileName = "FileNotFound"
+	}
 	currProductMainPhoto = &http_model.ProductPhoto{
 		PhotoUrl: findKuaishouProductData.KuaishouMainPhoto,
+		Name:     currDesiredFileName,
 		PhotoUid: generateRandomString(10),
 		Symbol:   1,
 	}
@@ -227,8 +236,16 @@ func (*product) QueryKuaishouProduct(ctx context.Context, newKuaishouProduct htt
 	for _, url := range findKuaishouProductData.KuaishouCarousePhotoList {
 		var currProductPhoto *http_model.ProductPhoto
 		rand.Seed(time.Now().UnixNano())
+		lastIndex := strings.LastIndex(url, "/")
+		var desiredFileName string
+		if lastIndex != -1 {
+			desiredFileName = url[lastIndex+1:]
+		} else {
+			desiredFileName = "FileNotFound"
+		}
 		currProductPhoto = &http_model.ProductPhoto{
 			PhotoUrl: url,
+			Name:     desiredFileName,
 			PhotoUid: generateRandomString(10),
 			Symbol:   2,
 		}
@@ -239,8 +256,16 @@ func (*product) QueryKuaishouProduct(ctx context.Context, newKuaishouProduct htt
 	for _, url := range findKuaishouProductData.KuaishouDetailPhotoList {
 		var currProductPhoto *http_model.ProductPhoto
 		rand.Seed(time.Now().UnixNano())
+		lastIndex := strings.LastIndex(url, "/")
+		var desiredFileName string
+		if lastIndex != -1 {
+			desiredFileName = url[lastIndex+1:]
+		} else {
+			desiredFileName = "FileNotFound"
+		}
 		currProductPhoto = &http_model.ProductPhoto{
 			PhotoUrl: url,
+			Name:     desiredFileName,
 			PhotoUid: generateRandomString(10),
 			Symbol:   4,
 		}