Merge branch 'develop' of k.zhang/duoduo into master

apis/shanghu/base.go

@@ -34,5 +34,6 @@ func InitShangHuRouter(engine *gin.RouterGroup) {
 		v1.POST("/merchant/sale/list", GetMerchantPayTransList)             //销售记录
 		v1.POST("/merchant/cancel", CancelNumber)                           //核销
 		v1.POST("/merchant/update/whxy", UpdateMerchantCardWXYZ)            //xyz                               //更新坐标
+		v1.POST("/merchant/user/code", MerchantUserCode)                    //
 	}
 }

apis/shanghu/merchant.user.go

@@ -167,3 +167,27 @@ func ClientGetUserInfo(c *gin.Context) {
 	app.OK(c, userInfo, app.Success)
 
 }
+
+func MerchantUserCode(c *gin.Context) {
+	var inData models.MerchantUserCodeRequest
+	var sqlData shanghu.MerchantUser
+	var outData models.MerchantUserCodeResponse
+
+	err := c.ShouldBindJSON(&inData)
+	if err != nil {
+		app.Error(c, 400, err, err.Error())
+		return
+	}
+
+	//查询数据
+	sqlData.Code = inData.Code
+	userInfo, err := sqlData.GetUserInfoByCode()
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+	outData.OpenId = userInfo.OpenID
+
+	app.OK(c, outData, app.Success)
+
+}

apis/shanghu/models/user.go

@@ -18,3 +18,11 @@ type GetUserInfoRequest struct {
 type GetUserInfoResponse struct {
 	OpenId string `json:"open_id"`
 }
+
+type MerchantUserCodeRequest struct {
+	Code string `json:"code"`
+}
+
+type MerchantUserCodeResponse struct {
+	OpenId string `json:"open_id"`
+}

models/shanghu/merchant_user.go

@@ -57,6 +57,20 @@ func (m *MerchantUser) GetUserInfo() (MerchantUser, error) {
 
 }
 
+func (m *MerchantUser) GetUserInfoByCode() (MerchantUser, error) {
+	var doc MerchantUser
+
+	table := orm.ShMysql.Table(m.TableName())
+	table = table.Where("code = ?  ", m.Code)
+
+	if err := table.Select("open_id").First(&doc).Error; err != nil {
+		return doc, err
+	}
+
+	return doc, nil
+
+}
+
 func (u *MerchantUser) Create() (MerchantUser, error) {
 	var doc MerchantUser
 	var err error