Skip to content
This repository has been archived by the owner on Mar 22, 2024. It is now read-only.

Commit

Permalink
[执照审核]
Browse files Browse the repository at this point in the history
  • Loading branch information
Thxzzzzz committed May 18, 2019
1 parent 2b76be6 commit 7d04036
Show file tree
Hide file tree
Showing 14 changed files with 543 additions and 20 deletions.
83 changes: 83 additions & 0 deletions controllers/license.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
package controllers

import (
"encoding/json"
"funding/enums"
"funding/models"
"funding/objects"
"github.com/jinzhu/gorm"
)

// 营业执照相关
// 放在 /user/license 路由下吧
type LicenseController struct {
BaseController
}

// @Title 保存产品
// @Description 保存产品
// @Param form body models.License true "产品model"
// @Success 200
// @Failure 400
// @router /save [post]
func (c *LicenseController) SaveLicense() {
// 如果不是卖家 那就返回错误
user, err := c.CheckAndGetUser()
if err != nil {
c.ResponseErrJson(err)
return
}
//if user.RoleId != enums.Role_Seller {
// c.ResponseErrJson(&resultError.UserRoleVerifyError)
// return
//}
// 获取传过来的产品信息
form := models.License{}
err = json.Unmarshal(c.Ctx.Input.RequestBody, &form)
if err != nil {
c.ResponseErrJson(err)
return
}
isUpdate := false
// 添加ID
form.UserId = user.ID
// 如果有 license_id 先查询是否存在 对应执照,存在则说明是要更新而不是新增
if form.ID > 0 {
oldLicense, err := models.FindLicenseById(form.ID)
// 如果出错返回错误
if err != nil && err != gorm.ErrRecordNotFound {
c.ResponseErrJson(err)
return
// 如果没找到记录则标记一下,后面将新建产品
} else if gorm.IsRecordNotFoundError(err) {
isUpdate = false
} else {
// 如果找到了记录,则标记为更新,后面对相应的产品进行更新
isUpdate = true
}

// 如果是卖家而且 userId 对不上 也返回错误
if isUpdate && form.UserId != oldLicense.UserId {
c.ResponseErrJson(resultError.NewFallFundingErr("这不是你的执照"))
return
}
}

// 卖家不能改成除了待审核/待提交以外的状态,如果这以外的参数有则去掉
if form.VerifyStatus != enums.Verify_Wait && form.VerifyStatus != enums.Verify_UnSubmit {
form.VerifyStatus = 0
}

if isUpdate {
err = models.UpdateLicense(&form)
} else {
err = models.InsertLicense(&form)
}
// 发生错误则返回错误
if err != nil {
c.ResponseErrJson(err)
return
}
// 成功保存,返回已保存的数据
c.ResponseSuccessJson(form)
}
18 changes: 10 additions & 8 deletions funding.sql

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lastupdate.tmp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"C:\\GoPath\\src\\funding\\controllers":1558169727858884600,"C:\\GoPath\\src\\funding\\managerControllers":1558170015040063800}
{"C:\\GoPath\\src\\funding\\controllers":1558199422466682000,"C:\\GoPath\\src\\funding\\managerControllers":1558204453579045400}
27 changes: 26 additions & 1 deletion managerControllers/license.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,23 @@ type LicenseController struct {
controllers.VailUserController
}

// 根据产品 Id 获取执照信息
// @router /licenseById [get]
func (c *LicenseController) GetLicenseById() {
// 获取传过来的Id
id, err := c.GetUint64("id")
if err != nil {
c.ResponseErrJson(err)
return
}
result, err := models.FindLicenseById(id)
if err != nil {
c.ResponseErrJson(err)
return
}
c.ResponseSuccessJson(result)
}

// @Title 获取全部执照信息
// @Description
// @Success 200
Expand Down Expand Up @@ -83,7 +100,15 @@ func (c *LicenseController) UpdateLicense() {
// 通过验证,将对应用户改为商家
if form.VerifyStatus == enums.Verify_Success {
form.VerifyMessage = "审核通过"
user, err := models.FindUserById(form.ID)
// 查找对应的 license 信息
license, err := models.FindLicenseById(form.ID)
if err != nil {
c.ResponseErrJson(err)
return
}
// 取对应的商家 ID
form.UserId = license.UserId
user, err := models.FindUserById(form.UserId)
if err != nil {
c.ResponseErrJson(err)
return
Expand Down
16 changes: 8 additions & 8 deletions models/license.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package models
// 执照信息 对应 licenses 表
type License struct {
BaseModel
UserId uint64 `json:"user_id"` // 用户ID
CompanyName string `json:"company_name"` // 公司名
Description string `json:"description"` // 公司描述
Address string `json:"address"` // 联系地址
Phone string `json:"phone"` // 联系电话
LicenseImageUrl string `json:"license_image_url"` // 营业执照照片地址
VerifyStatus int `json:"verify_status"` // 审核状态 1:已通过 2:待审核 3: 待提交 4: 未通过
VerifyMessage string `json:"verify_message"` // 审核消息(审核不通过时显示)
UserId uint64 `json:"user_id"` // 用户ID
CompanyName string `json:"company_name"` // 公司名
Description string `json:"description"` // 公司描述
Address string `json:"address"` // 联系地址
Phone string `json:"phone"` // 联系电话
LicenseImageUrl string `json:"license_image_url"` // 营业执照照片地址
VerifyStatus int `json:"verify_status" gorm:"default:3` // 审核状态 1:已通过 2:待审核 3: 待提交 4: 未通过
VerifyMessage string `json:"verify_message"` // 审核消息(审核不通过时显示)
}

///////////////////// 基本增删改查 /////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ func init() {
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/controllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/controllers:LicenseController"],
beego.ControllerComments{
Method: "SaveLicense",
Router: `/save`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/controllers:OrderController"] = append(beego.GlobalControllerRouter["funding/controllers:OrderController"],
beego.ControllerComments{
Method: "AddOrder",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ func init() {
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/managerControllers:LicenseController"],
beego.ControllerComments{
Method: "GetLicenseById",
Router: `/licenseById`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/managerControllers:LicenseController"],
beego.ControllerComments{
Method: "UpdateLicense",
Expand All @@ -43,6 +52,24 @@ func init() {
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"] = append(beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"],
beego.ControllerComments{
Method: "GetPkgListByProductId",
Router: `/pkgListByProductId`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"] = append(beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"],
beego.ControllerComments{
Method: "GetProductById",
Router: `/productById`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"] = append(beego.GlobalControllerRouter["funding/managerControllers:ManagerProductController"],
beego.ControllerComments{
Method: "UpdateProduct",
Expand Down
9 changes: 9 additions & 0 deletions routers/commentsRouter_controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ func init() {
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/controllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/controllers:LicenseController"],
beego.ControllerComments{
Method: "SaveLicense",
Router: `/save`,
AllowHTTPMethods: []string{"post"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/controllers:OrderController"] = append(beego.GlobalControllerRouter["funding/controllers:OrderController"],
beego.ControllerComments{
Method: "AddOrder",
Expand Down
9 changes: 9 additions & 0 deletions routers/commentsRouter_managerControllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ func init() {
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/managerControllers:LicenseController"],
beego.ControllerComments{
Method: "GetLicenseById",
Router: `/licenseById`,
AllowHTTPMethods: []string{"get"},
MethodParams: param.Make(),
Filters: nil,
Params: nil})

beego.GlobalControllerRouter["funding/managerControllers:LicenseController"] = append(beego.GlobalControllerRouter["funding/managerControllers:LicenseController"],
beego.ControllerComments{
Method: "UpdateLicense",
Expand Down
5 changes: 5 additions & 0 deletions routers/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ func init() {
&controllers.CartController{},
),
),
beego.NSNamespace("/user/license",
beego.NSInclude(
&controllers.LicenseController{},
),
),
beego.NSNamespace("/order",
beego.NSInclude(
&controllers.OrderController{},
Expand Down
Loading

0 comments on commit 7d04036

Please sign in to comment.