fix:loginwithname

internal/api/mobile/users/login.go

@@ -4,11 +4,8 @@ import (
 	"crypto/aes"
 	"crypto/cipher"
 	"encoding/json"
+	"errors"
 	"fmt"
-	"github.com/gin-gonic/gin"
-	"github.com/go-redis/redis"
-	"github.com/golangkit/formatime"
-	"github.com/jinzhu/gorm"
 	"io"
 	"io/ioutil"
 	"log"
@@ -18,12 +15,19 @@ import (
 	"path/filepath"
 	"recook/internal/back"
 	"recook/internal/cache"
+	"recook/internal/dbc"
 	. "recook/internal/dbc"
 	"recook/internal/define"
 	"recook/internal/model/user"
 	service "recook/internal/service/app"
 	"recook/internal/static_path"
+	"recook/internal/v2/model/company"
 	"recook/tools"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-redis/redis"
+	"github.com/golangkit/formatime"
+	"github.com/jinzhu/gorm"
 )
 
 type weChatLogin struct {
@@ -524,6 +528,52 @@ func LoginByMobile(c *gin.Context) {
 	}
 }
 
+type ArgsLoginInfo struct {
+	Name     string `json:"name"`
+	Password string `json:"password"`
+}
+
+func LoginByName(c *gin.Context) {
+	var p ArgsLoginInfo
+	err := tools.ParseParams(&p, c)
+	if err != nil {
+		back.Fail(c, err.Error())
+		return
+	}
+	var obj company.Info
+	if err := dbc.DB.First(&obj, "shop_name= ?", p.Name).Error; err != nil {
+		back.Fail(c, err.Error())
+		return
+
+	}
+	if obj.State != 2 {
+		err := errors.New("未通过审核")
+		back.Fail(c, err.Error())
+		return
+	}
+	if obj.Status != 1 {
+		err := errors.New("被禁用")
+		back.Fail(c, err.Error())
+		return
+	}
+	if obj.Password != p.Password {
+		err := errors.New("密码不正确")
+		back.Fail(c, err.Error())
+		return
+	}
+
+	var info user.Information
+
+	err = DB.First(&info, "id = ?", obj.ID).Error
+	if err != nil {
+
+		back.Err(c, "用户不存在："+err.Error())
+	} else {
+		login(c, &info)
+	}
+
+}
+
 // AutoLogin 自动登录
 func AutoLogin(c *gin.Context) {
 	var p autoLoginParam

internal/gateway/app/v1.go

@@ -92,6 +92,7 @@ func SetupRouter(v1 *gin.RouterGroup) {
 				profileR.POST("/wx/mini/login", users.LoginByMiniProgram)
 				profileR.POST("/wx/mini/loginv2", users.V2LoginByMiniProgram)
 				profileR.POST("/mobile/login", users.LoginByMobile)
+				profileR.POST("/mobile/loginN2", users.LoginByName)
 				profileR.POST("/mobile/login_unionid", users.UnionID)
 				profileR.POST("/mobile/register", users.MobileRegister)
 				profileR.POST("/mobile/register-wxapp", users.MobileRegisterWxapp)