From d10869cef45bb6bdd8bca8a4109fc84f3975e6ea Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 21 Sep 2018 09:56:05 +0800
Subject: [PATCH] - dont't use JdRange2JxRange.

---
 business/model/sku.go                     |  2 +-
 business/model/store_sku.go               |  2 +-
 business/partner/purchase/ebai/store.go   | 10 ++++++++++
 business/partner/purchase/jd/store_sku.go |  2 +-
 controllers/auth_controller.go            |  6 +++---
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/business/model/sku.go b/business/model/sku.go
index 3c6c978c9..31be9ef04 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -142,7 +142,7 @@ type SkuCategory struct {
 
 func (*SkuCategory) TableUnique() [][]string {
 	return [][]string{
-		[]string{"Name", "DeletedAt", "Level"},
+		[]string{"Name", "Level", "DeletedAt"},
 		[]string{"JdID", "DeletedAt"},
 	}
 }
diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index d23b05d24..61414d4aa 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -21,7 +21,7 @@ type StoreSkuCategoryMap struct {
 
 func (*StoreSkuCategoryMap) TableUnique() [][]string {
 	return [][]string{
-		[]string{"StoreID", "SkuCategoryID"},
+		[]string{"StoreID", "SkuCategoryID", "DeletedAt"},
 	}
 }
 
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 1d272ea60..0618aa4d0 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -131,6 +131,16 @@ func (p *PurchaseHandler) UpdateStore(storeID int, userName string) (err error)
 						// todo remove out shop id
 					}
 				}
+				if err == nil {
+					mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus)
+					if mergeStatus == model.StoreStatusOpened {
+						err = api.EbaiAPI.ShopOnline("", utils.Str2Int64(store.VendorStoreID))
+					} else if mergeStatus == model.StoreStatusClosed {
+						err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID))
+					} else if mergeStatus == model.StoreStatusClosed {
+						err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID))
+					}
+				}
 			}
 		}
 	}
diff --git a/business/partner/purchase/jd/store_sku.go b/business/partner/purchase/jd/store_sku.go
index 234b76e6b..0f3f2ba56 100644
--- a/business/partner/purchase/jd/store_sku.go
+++ b/business/partner/purchase/jd/store_sku.go
@@ -11,7 +11,7 @@ import (
 )
 
 // 京东到家，以有库存表示关注（认领）
-func (p *PurchaseHandler) SyncStoreSkus(storeID int, skuIDs []int, isForce bool, userName string) (err error) {
+func (p *PurchaseHandler) SyncStoreSku(storeID int, skuIDs []int, isForce bool, userName string) (err error) {
 	db := dao.GetDB()
 	var storeSkus []*model.StoreSkuBind
 	sqlParams := []interface{}{
diff --git a/controllers/auth_controller.go b/controllers/auth_controller.go
index 535525508..6189260f3 100644
--- a/controllers/auth_controller.go
+++ b/controllers/auth_controller.go
@@ -31,9 +31,9 @@ var (
 
 // @Title 给微信用的回调接口
 // @Description 给微信用的回调接口，自己不能直接调用
-// @Param	code		query		string		true	"门店ID"
-// @Param	block		query		string		true	"门店所属的厂商ID"
-// @Param	state		query		string		false	"门店所属的厂商ID"
+// @Param	code		query		string		true	"客户同意后得到的code"
+// @Param	block		query		string		true	"回调地址"
+// @Param	state		query		string		false	"微信回调的登录状态"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetWeiXinUserInfo [get]