From 689e7b4bc70ded130c854d8fb118e77b74643bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 3 Feb 2021 14:36:11 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/store.go               | 17 +++++++++++++++++
 business/partner/purchase/ebai/order_afs.go |  2 +-
 controllers/cms_store.go                    |  5 ++++-
 routers/commentsRouter_controllers.go       |  9 +++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index bb13a516c..c01a7c28b 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -3887,3 +3887,20 @@ func UpdateBrand(ctx *jxcontext.Context, payload map[string]interface{}, isDel b
 	}
 	return err
 }
+
+func CreateVendorStore(ctx *jxcontext.Context, storeID, vendorID int, payload map[string]interface{}) (err error) {
+	// var (
+	// 	db = dao.GetDB()
+	// )
+	if payload["vendorOrgCode"] == nil {
+		return fmt.Errorf("请选择平台账号！")
+	}
+	// storeDetail, _ := dao.GetStoreDetail(db, storeID, vendorID, payload["vendorOrgCode"].(string))
+	// handler := partner.GetPurchasePlatformFromVendorID(vendorID)
+	// vendorStoreID, err := handler.CreateStore2(db, storeID, ctx.GetUserName(), payload)
+	// if err != nil {
+	// 	return err
+	// }
+	// AddStoreVendorMap(ctx, db, vendorID, vendorOrgCode, storeID, storeMap)
+	return err
+}
diff --git a/business/partner/purchase/ebai/order_afs.go b/business/partner/purchase/ebai/order_afs.go
index 68c2c9e99..b4f782af6 100644
--- a/business/partner/purchase/ebai/order_afs.go
+++ b/business/partner/purchase/ebai/order_afs.go
@@ -36,7 +36,7 @@ var (
 func (c *PurchaseHandler) isAfsMsg(msg *ebaiapi.CallbackMsg) bool {
 	if msg.Cmd == ebaiapi.CmdOrderPartRefund {
 		msgType := int(utils.MustInterface2Int64(msg.Body["type"]))
-		return msgType == ebaiapi.OrderPartRefuncTypeCustomer
+		return msgType == ebaiapi.OrderPartRefuncTypeCustomer || msgType == ebaiapi.OrderPartRefuncTypeCS
 	} else if msg.Cmd == ebaiapi.CmdOrderUserCancel {
 		cancelType := int(utils.MustInterface2Int64(msg.Body["cancel_type"]))
 		return cancelType == ebaiapi.OrderUserCancelTypeAfterSale
diff --git a/controllers/cms_store.go b/controllers/cms_store.go
index 2c66d9f2a..4b8231aee 100644
--- a/controllers/cms_store.go
+++ b/controllers/cms_store.go
@@ -1008,11 +1008,14 @@ func (c *StoreController) InsertStoreCategories() {
 // @Title 创建平台门店
 // @Description 创建平台门店
 // @Param	token			header		string	true	"认证token"
+// @Param	storeID			formData	int		true	"门店ID"
 // @Param	vendorID		formData	int		true	"平台ID"
 // @Param	payload			formData	string	true	"json数据，store对象"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /CreateVendorStore [post]
 func (c *StoreController) CreateVendorStore() {
-
+	c.callCreateVendorStore(func(params *tStoreCreateVendorStoreParams) (retVal interface{}, errCode string, err error) {
+		return retVal, "", err
+	})
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index c6afd10a2..4fa28101e 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -2025,6 +2025,15 @@ func init() {
             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: "CreateVendorStore",
+            Router: `/CreateVendorStore`,
+            AllowHTTPMethods: []string{"post"},
+            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: "DeletePrinterSeq",