From 7279c48a1084344dbb4953ba081644778b5c62cb Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 27 Apr 2021 10:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=89=A9=E6=96=99=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/dao_matter.go      | 15 +++++++++++++++
 business/model/matter.go              | 17 +++++++++++++++++
 controllers/job_controller.go         | 14 ++++++++++++++
 globals/beegodb/beegodb.go            |  1 +
 routers/commentsRouter_controllers.go |  9 +++++++++
 5 files changed, 56 insertions(+)
 create mode 100644 business/model/dao/dao_matter.go
 create mode 100644 business/model/matter.go

diff --git a/business/model/dao/dao_matter.go b/business/model/dao/dao_matter.go
new file mode 100644
index 000000000..685ba3232
--- /dev/null
+++ b/business/model/dao/dao_matter.go
@@ -0,0 +1,15 @@
+package dao
+
+import (
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func GetVendorMatterCategory(db *DaoDB, vendorID int) (vendorMatterCat []*model.VendorMatterCategory, err error) {
+	sql := `
+		SELECT * FROM vendor_matter_catgory WHERE deleted_at = ? AND vendor_id = ?
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue, vendorID}
+	err = GetRows(db, &vendorMatterCat, sql, sqlParams)
+	return vendorMatterCat, err
+}
diff --git a/business/model/matter.go b/business/model/matter.go
new file mode 100644
index 000000000..26169f2b2
--- /dev/null
+++ b/business/model/matter.go
@@ -0,0 +1,17 @@
+package model
+
+type VendorMatterCategory struct {
+	ModelIDCULD
+
+	VendorID     int    `orm:"column(vendor_id)" json:"vendorID"`
+	CategoryID   int    `orm:"column(category_id)" json:"categoryID"`
+	CategoryName string `json:"categoryName"`
+	ParentID     int    `orm:"column(parent_id)" json:"parentID"`
+	Level        int    `json:"level"`
+}
+
+func (v *VendorMatterCategory) TableUnique() [][]string {
+	return [][]string{
+		[]string{"VendorID", "CategoryID"},
+	}
+}
diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index 1d97c38e6..68eaafadb 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -596,3 +596,17 @@ func (c *JobController) GetUnionJobOrderInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 查询平台物料分类
+// @Description 查询平台物料分类
+// @Param	token			header		string		true	"认证token"
+// @Param	vendorID		query		int			true	"平台ID"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetVendorMatterCategory [get]
+func (c *JobController) GetVendorMatterCategory() {
+	c.callGetVendorMatterCategory(func(params *tJobGetVendorMatterCategoryParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = dao.GetVendorMatterCategory(dao.GetDB(), params.VendorID)
+		return retVal, "", err
+	})
+}
diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index 11b8cf82b..18ac61158 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -39,6 +39,7 @@ func Init() {
 	orm.RegisterModel(&model.OperateEvent{})
 	orm.RegisterModel(&model.NewConfig{}, &legacymodel.Config{})
 	orm.RegisterModel(&model.AddressDistinguish{})
+	orm.RegisterModel(&model.VendorMatterCategory{}) //平台物流分类（手动添的）
 	// create table
 	orm.RunSyncdb("default", false, true)
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index e2579c67e..5c0e9cc91 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -619,6 +619,15 @@ func init() {
 			Filters:          nil,
 			Params:           nil})
 
+	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"],
+		beego.ControllerComments{
+			Method:           "GetVendorMatterCategory",
+			Router:           "/GetVendorMatterCategory",
+			AllowHTTPMethods: []string{"get"},
+			MethodParams:     param.Make(),
+			Filters:          nil,
+			Params:           nil})
+
 	beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"],
 		beego.ControllerComments{
 			Method:           "SubmitJob",