From 44e9eea0f1f8b0502ab5aa584494d48921b8d344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 26 Jan 2021 10:26:04 +0800
Subject: [PATCH] aa

---
 business/jxstore/common/common.go     |  4 ++
 business/model/dao/common.go          | 19 ++++++++++
 controllers/sys.go                    |  4 +-
 routers/commentsRouter_controllers.go | 54 +++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go
index 88cfffaef..7ba9e7a0b 100644
--- a/business/jxstore/common/common.go
+++ b/business/jxstore/common/common.go
@@ -230,3 +230,7 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius
 	}
 	return storeList, err
 }
+
+func GetVendorOrgCode(ctx *jxcontext.Context, vendorID int, vendorOrgCode string) (vendorOrgs []*model.VendorOrgCode, err error) {
+	return dao.GetVendorOrgCode(dao.GetDB(), vendorID, vendorOrgCode)
+}
diff --git a/business/model/dao/common.go b/business/model/dao/common.go
index f3dbab71a..23b911831 100644
--- a/business/model/dao/common.go
+++ b/business/model/dao/common.go
@@ -30,3 +30,22 @@ func GetNeedUploadDataResource(db *DaoDB) (dataResList []*model.DataResource, er
 	err = GetRows(db, &dataResList, sql)
 	return dataResList, err
 }
+
+func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode string) (vendorOrgs []*model.VendorOrgCode, err error) {
+	sql := ` 
+		SELECT *
+		  FROM vendor_org_code 
+		 WHERE deleted_at = ? 
+	`
+	sqlParams := []interface{}{}
+	if vendorID != -1 {
+		sql += " AND vendor_id = ?"
+		sqlParams = append(sqlParams, vendorID)
+	}
+	if vendorOrgCode != "" {
+		sql += " AND vendor_org_code = ?"
+		sqlParams = append(sqlParams, vendorOrgCode)
+	}
+	err = GetRows(db, &vendorOrgs, sql, sqlParams)
+	return vendorOrgs, err
+}
diff --git a/controllers/sys.go b/controllers/sys.go
index 5b5d80a50..28e6214a2 100644
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -7,6 +7,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxstore/common"
+
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
 
 	"git.rosy.net.cn/jx-callback/globals"
@@ -135,7 +137,7 @@ func (c *SysController) GetEbaiRTFDetail() {
 // @router /GetVendorOrgCode [get]
 func (c *SysController) GetVendorOrgCode() {
 	c.callGetVendorOrgCode(func(params *tSysGetVendorOrgCodeParams) (retVal interface{}, errCode string, err error) {
-
+		retVal, err = common.GetVendorOrgCode(params.Ctx, params.VendorID, params.VendorOrgCode)
 		return retVal, "", err
 	})
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 98b7c0a99..84292f754 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1656,6 +1656,24 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "AddThingMap",
+            Router: `/AddThingMap`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "CopyJdStoreCategories",
+            Router: `/CopyJdStoreCategories`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
         beego.ControllerComments{
             Method: "CopyStoreCategories",
@@ -1755,6 +1773,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "GetThingMap",
+            Router: `/GetThingMap`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
         beego.ControllerComments{
             Method: "GetVendorCategories",
@@ -1791,6 +1818,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "ReorderJdCategories",
+            Router: `/ReorderJdCategories`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
         beego.ControllerComments{
             Method: "ReorderStoreCategories",
@@ -1899,6 +1935,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
+        beego.ControllerComments{
+            Method: "UpdateThingMap",
+            Router: `/UpdateThingMap`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreController"],
         beego.ControllerComments{
             Method: "AddBrand",
@@ -2862,6 +2907,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"],
+        beego.ControllerComments{
+            Method: "GetVendorOrgCode",
+            Router: `/GetVendorOrgCode`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"],
         beego.ControllerComments{
             Method: "GetWX2Token",