From 28993d8339aa4734c151b27ebe537b413df19c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 16:16:25 +0800
Subject: [PATCH 001/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/api_config.go | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/business/model/api_config.go b/business/model/api_config.go
index d51bffb6d..fb5b25ad0 100644
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -15,6 +15,7 @@ const (
 	VendorIDELM           = 2
 	VendorIDEBAI          = 3
 	VendorIDYB            = 4  //银豹
+	VendorIDJDShop        = 5  //京东商城
 	VendorIDWSC           = 11 // 微盟微商城
 	VendorIDPurchaseEnd   = 11
 	VendorIDJX            = 9 // 这是一个假的京西VendorID
@@ -63,13 +64,14 @@ type VendorInfo struct {
 
 var (
 	VendorNames = map[int]string{
-		VendorIDJD:   "Jd",
-		VendorIDMTWM: "Mtwm",
-		VendorIDELM:  "Elm",
-		VendorIDEBAI: "Ebai",
-		VendorIDWSC:  "Wsc",
-		VendorIDYB:   "Yb",
-		VendorIDJX:   "Jx",
+		VendorIDJD:     "Jd",
+		VendorIDMTWM:   "Mtwm",
+		VendorIDELM:    "Elm",
+		VendorIDEBAI:   "Ebai",
+		VendorIDWSC:    "Wsc",
+		VendorIDYB:     "Yb",
+		VendorIDJX:     "Jx",
+		VendorIDJDShop: "Jds",
 
 		VendorIDDada: "Dada",
 		VendorIDMTPS: "Mtps",
@@ -90,13 +92,14 @@ var (
 	}
 
 	VendorChineseNames = map[int]string{
-		VendorIDJD:   "京东到家",
-		VendorIDMTWM: "美团外卖",
-		VendorIDELM:  "饿了么",
-		VendorIDEBAI: "饿百新零售",
-		VendorIDYB:   "银豹",
-		VendorIDWSC:  "微盟微商城",
-		VendorIDJX:   "京西商城",
+		VendorIDJD:     "京东到家",
+		VendorIDMTWM:   "美团外卖",
+		VendorIDELM:    "饿了么",
+		VendorIDEBAI:   "饿百新零售",
+		VendorIDYB:     "银豹",
+		VendorIDJDShop: "京东商城",
+		VendorIDWSC:    "微盟微商城",
+		VendorIDJX:     "京西商城",
 
 		VendorIDDada: "达达众包",
 		VendorIDMTPS: "美团配送",

From 49a7b81d98c73479702cc76d21366b1c4f88e8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 16:19:56 +0800
Subject: [PATCH 002/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store_sku.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index 0519894d0..85e0cb3dd 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -107,6 +107,7 @@ type StoreSkuBind struct {
 	MtwmSyncStatus int8 `orm:"default(2)"`
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	YbSyncStatus   int8 `orm:"default(2)"`
+	JdsSyncStatus  int8 `orm:"default(2)"` //京东商城
 	// WscSyncStatus  int8 `orm:"default(2)"`
 
 	JdPrice   int `json:"jdPrice"`
@@ -114,8 +115,10 @@ type StoreSkuBind struct {
 	EbaiPrice int `json:"ebaiPrice"`
 	JxPrice   int `json:"jxPrice"`
 	YbPrice   int `json:"ybPrice"`
+	JdsPrice  int `json:"jdsPrice"`
 
 	JdLockTime   *time.Time `orm:"null" json:"jdLockTime"`
+	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime"`
 	MtwmLockTime *time.Time `orm:"null" json:"mtwmLockTime"`
 	EbaiLockTime *time.Time `orm:"null" json:"ebaiLockTime"`
 	JxLockTime   *time.Time `orm:"null" json:"jxLockTime"`

From 59d25695c6994ccb57557c4f291ad249af6759de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 16:33:49 +0800
Subject: [PATCH 003/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index 85e0cb3dd..719a34b37 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -99,6 +99,7 @@ type StoreSkuBind struct {
 	MtwmID int64 `orm:"column(mtwm_id);index"`
 	EbaiID int64 `orm:"column(ebai_id);index"`
 	YbID   int64 `orm:"column(yb_id);index"`
+	JdsID  int64 `orm:"column(jds_id);index"`
 	// WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
 	// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId
 

From db198ca956524d2e188c823b6f31b9cf68685e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 16:44:17 +0800
Subject: [PATCH 004/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 8d83e5075..fc6c0494d 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -1329,6 +1329,8 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
 						vendorInfo := &StoreSkuVendorInfo{
 							VendorID: vendorID,
 						}
+						fmt.Println("tes1", GetVendorPriceStructField(model.VendorNames[vendorID]))
+						fmt.Println("tes1", utils.Format4Output(v, false))
 						vendorInfo.VendorPrice = refutil.GetObjFieldByName(v, GetVendorPriceStructField(model.VendorNames[vendorID])).(int)
 						lockTime, _ := refutil.GetObjFieldByName(v, GetVendorLockTimeStructField(model.VendorNames[vendorID])).(*time.Time)
 						vendorInfo.LockTime = lockTime

From 501557778c70fbc71dc3a58d9cb5465745bf9cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:06:36 +0800
Subject: [PATCH 005/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index fc6c0494d..fec9b61b0 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -216,19 +216,23 @@ type StoreSkuExt struct {
 	EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"`
 	MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致
 	YbID   string `orm:"column(yb_id);index" json:"ybID"`
+	JdsID  int64  `orm:"column(jds_id);index"`
 
 	JdSyncStatus   int8 `orm:"default(2)" json:"jdSyncStatus"`
 	EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`
 	MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"`
 	YbSyncStatus   int8 `orm:"default(2)" json:"ybSyncStatus"`
+	JdsSyncStatus  int8 `orm:"default(2)"` //京东商城
 
 	JdPrice   int `json:"jdPrice"`
 	EbaiPrice int `json:"ebaiPrice"`
 	MtwmPrice int `json:"mtwmPrice"`
 	JxPrice   int `json:"jxPrice"`
 	YbPrice   int `json:"ybPrice"`
+	JdsPrice  int `json:"jdsPrice"`
 
 	JdLockTime   *time.Time `orm:"null" json:"jdLockTime,omitempty"`
+	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime"`
 	EbaiLockTime *time.Time `orm:"null" json:"ebaiLockTime,omitempty"`
 	MtwmLockTime *time.Time `orm:"null" json:"mtwmLockTime,omitempty"`
 	JxLockTime   *time.Time `orm:"null" json:"jxLockTime,omitempty"`
@@ -1329,8 +1333,6 @@ func UpdateActPrice4StoreSkuNameNew(db *DaoDB, storeIDs, skuIDs []int, skuNamesI
 						vendorInfo := &StoreSkuVendorInfo{
 							VendorID: vendorID,
 						}
-						fmt.Println("tes1", GetVendorPriceStructField(model.VendorNames[vendorID]))
-						fmt.Println("tes1", utils.Format4Output(v, false))
 						vendorInfo.VendorPrice = refutil.GetObjFieldByName(v, GetVendorPriceStructField(model.VendorNames[vendorID])).(int)
 						lockTime, _ := refutil.GetObjFieldByName(v, GetVendorLockTimeStructField(model.VendorNames[vendorID])).(*time.Time)
 						vendorInfo.LockTime = lockTime

From ef77aae37f9417f92a538649c03a83c27bcb7d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:09:02 +0800
Subject: [PATCH 006/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index fec9b61b0..457b75621 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -216,7 +216,7 @@ type StoreSkuExt struct {
 	EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"`
 	MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致
 	YbID   string `orm:"column(yb_id);index" json:"ybID"`
-	JdsID  int64  `orm:"column(jds_id);index"`
+	JdsID  int64  `orm:"column(jds_id);index" json:"jdsID"`
 
 	JdSyncStatus   int8 `orm:"default(2)" json:"jdSyncStatus"`
 	EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`

From c628891c04c4b9918f9ac67a198b3cd73b4e9153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:12:48 +0800
Subject: [PATCH 007/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 457b75621..866c1debc 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -222,7 +222,7 @@ type StoreSkuExt struct {
 	EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`
 	MtwmSyncStatus int8 `orm:"default(2)" json:"mtwmSyncStatus"`
 	YbSyncStatus   int8 `orm:"default(2)" json:"ybSyncStatus"`
-	JdsSyncStatus  int8 `orm:"default(2)"` //京东商城
+	JdsSyncStatus  int8 `orm:"default(2)" json:"jdsSyncStatus"` //京东商城
 
 	JdPrice   int `json:"jdPrice"`
 	EbaiPrice int `json:"ebaiPrice"`
@@ -232,7 +232,7 @@ type StoreSkuExt struct {
 	JdsPrice  int `json:"jdsPrice"`
 
 	JdLockTime   *time.Time `orm:"null" json:"jdLockTime,omitempty"`
-	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime"`
+	JdsLockTime  *time.Time `orm:"null" json:"jdsLockTime,omitempty"`
 	EbaiLockTime *time.Time `orm:"null" json:"ebaiLockTime,omitempty"`
 	MtwmLockTime *time.Time `orm:"null" json:"mtwmLockTime,omitempty"`
 	JxLockTime   *time.Time `orm:"null" json:"jxLockTime,omitempty"`

From 9ab49d00f3e3d63b366e3e473a06bd1bb7c59af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:14:46 +0800
Subject: [PATCH 008/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 866c1debc..99a636f49 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -216,7 +216,7 @@ type StoreSkuExt struct {
 	EbaiID string `orm:"column(ebai_id);index" json:"ebaiID"`
 	MtwmID string `orm:"column(mtwm_id)" json:"mtwmID"` // 这个也不是必须的，只是为了DAO取数据语句一致
 	YbID   string `orm:"column(yb_id);index" json:"ybID"`
-	JdsID  int64  `orm:"column(jds_id);index" json:"jdsID"`
+	JdsID  string `orm:"column(jds_id);index" json:"jdsID"`
 
 	JdSyncStatus   int8 `orm:"default(2)" json:"jdSyncStatus"`
 	EbaiSyncStatus int8 `orm:"default(2)" json:"ebaiSyncStatus"`

From d511317a145e0431c41d873e915a5b12ced84f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:25:13 +0800
Subject: [PATCH 009/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/act.go       |  11 ++
 business/partner/purchase/jdshop/jds.go       |  42 +++++
 business/partner/purchase/jdshop/order.go     |  76 ++++++++
 .../partner/purchase/jdshop/order_comment.go  |   5 +
 business/partner/purchase/jdshop/sku.go       |  76 ++++++++
 business/partner/purchase/jdshop/store.go     |  44 +++++
 business/partner/purchase/jdshop/store_sku.go | 165 ++++++++++++++++++
 7 files changed, 419 insertions(+)
 create mode 100644 business/partner/purchase/jdshop/act.go
 create mode 100644 business/partner/purchase/jdshop/jds.go
 create mode 100644 business/partner/purchase/jdshop/order.go
 create mode 100644 business/partner/purchase/jdshop/order_comment.go
 create mode 100644 business/partner/purchase/jdshop/sku.go
 create mode 100644 business/partner/purchase/jdshop/store.go
 create mode 100644 business/partner/purchase/jdshop/store_sku.go

diff --git a/business/partner/purchase/jdshop/act.go b/business/partner/purchase/jdshop/act.go
new file mode 100644
index 000000000..d155fefd8
--- /dev/null
+++ b/business/partner/purchase/jdshop/act.go
@@ -0,0 +1,11 @@
+package jdshop
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.Act2, actOrderRules []*model.ActOrderRule, actStoreSkuList []*model.ActStoreSku2) (err error) {
+	return err
+}
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
new file mode 100644
index 000000000..7ce0b632d
--- /dev/null
+++ b/business/partner/purchase/jdshop/jds.go
@@ -0,0 +1,42 @@
+package jdshop
+
+import (
+	"fmt"
+
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/business/partner/putils"
+	"git.rosy.net.cn/jx-callback/globals/api"
+)
+
+var (
+	CurPurchaseHandler *PurchaseHandler
+)
+
+type PurchaseHandler struct {
+	partner.BasePurchasePlatform
+	putils.DefSingleStorePlatform
+}
+
+func init() {
+	if api.JdShopAPI != nil {
+		fmt.Println("test111111111111111111111")
+		CurPurchaseHandler = New()
+		partner.RegisterPurchasePlatform(CurPurchaseHandler)
+	}
+}
+
+func New() (obj *PurchaseHandler) {
+	obj = new(PurchaseHandler)
+	obj.ISingleStoreStoreSkuHandler = obj
+	return obj
+}
+
+func (p *PurchaseHandler) GetVendorID() int {
+	return model.VendorIDYB
+}
+
+func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
+	return imgHint, err
+}
diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
new file mode 100644
index 000000000..075526bc6
--- /dev/null
+++ b/business/partner/purchase/jdshop/order.go
@@ -0,0 +1,76 @@
+package jdshop
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+func (p *PurchaseHandler) AcceptOrRefuseFailedGetOrder(ctx *jxcontext.Context, order *model.GoodsOrder, isAcceptIt bool) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
+	return order
+}
+func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID string) (order *model.GoodsOrder, err error) {
+	return order, err
+}
+func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
+	return status, err
+}
+
+func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bool, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) CallCourier(ctx *jxcontext.Context, order *model.GoodsOrder) (err error) {
+	return err
+} // 取货失败后再次招唤平台配送
+func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *model.GoodsOrder) (err error) {
+	return err
+} // 投递失败后确认收到退货
+func (p *PurchaseHandler) CanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan bool, err error) {
+	return isCan, err
+}
+func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) GetOrderRealMobile(ctx *jxcontext.Context, order *model.GoodsOrder) (mobile string, err error) {
+	return mobile, err
+}
+func (p *PurchaseHandler) ReplyOrderComment(ctx *jxcontext.Context, vendorOrgCode string, orderComment *model.OrderComment, replyComment string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *model.GoodsOrder, isAgree bool, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) RefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) PartRefundOrder(ctx *jxcontext.Context, order *model.GoodsOrder, refundSkuList []*model.OrderSku, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) AgreeOrRefuseRefund(ctx *jxcontext.Context, order *model.AfsOrder, approveType int, reason string) (err error) {
+	return err
+}
+func (p *PurchaseHandler) ConfirmReceivedReturnGoods(ctx *jxcontext.Context, order *model.AfsOrder) (err error) {
+	return err
+}
diff --git a/business/partner/purchase/jdshop/order_comment.go b/business/partner/purchase/jdshop/order_comment.go
new file mode 100644
index 000000000..6505fdb3c
--- /dev/null
+++ b/business/partner/purchase/jdshop/order_comment.go
@@ -0,0 +1,5 @@
+package jdshop
+
+func (c *PurchaseHandler) StartRefreshComment() {
+
+}
diff --git a/business/partner/purchase/jdshop/sku.go b/business/partner/purchase/jdshop/sku.go
new file mode 100644
index 000000000..d60173580
--- /dev/null
+++ b/business/partner/purchase/jdshop/sku.go
@@ -0,0 +1,76 @@
+package jdshop
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner"
+)
+
+func (p *PurchaseHandler) GetAllCategories(ctx *jxcontext.Context, vendorOrgCode string) (cats []*partner.BareCategoryInfo, err error) {
+	return cats, err
+}
+
+// func (p *PurchaseHandler) UpdateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
+// 	return nil
+// }
+
+// func (p *PurchaseHandler) DeleteCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
+// 	return nil
+// }
+
+// func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, userName string) (err error) {
+// 	return err
+// }
+
+func (p *PurchaseHandler) CreateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) UpdateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteCategory2(ctx *jxcontext.Context, vendorOrgCode, vendorCatID string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCode, vendorParentCatID string, vendorCatIDList []string) (err error) {
+	return err
+}
+
+// func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+// 	return err
+// }
+
+// func (p *PurchaseHandler) ReadSku(ctx *jxcontext.Context, vendorOrgCode, vendorSkuID string) (skuNameExt *model.SkuNameExt, err error) {
+// 	return skuNameExt, err
+// }
+
+// func (p *PurchaseHandler) UpdateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+// 	return err
+// }
+
+// func (p *PurchaseHandler) DeleteSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
+// 	return err
+// }
+
+func (p *PurchaseHandler) CreateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) UpdateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteSku2(ctx *jxcontext.Context, vendorOrgCode string, sku *partner.StoreSkuInfo) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
+	return vendorCats, err
+}
+
+func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, vendorOrgCode string, skuID int, vendorSkuID string) (skuNameList []*partner.SkuNameInfo, err error) {
+	return skuNameList, err
+}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
new file mode 100644
index 000000000..de87f3149
--- /dev/null
+++ b/business/partner/purchase/jdshop/store.go
@@ -0,0 +1,44 @@
+package jdshop
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+)
+
+func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (storeDetail *dao.StoreDetail, err error) {
+	return storeDetail, err
+}
+
+// stoerIDs为nil表示所有
+func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
+	return hint, err
+}
+
+func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (storeStatus int, err error) {
+	return storeStatus, err
+}
+
+func (p *PurchaseHandler) EnableAutoAcceptOrder(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, isSetEnable bool) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) UpdateStoreOpTime(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, opTimeList []int16) (err error) {
+	return err
+}
+
+func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context, vendorOrgCode string) (vendorStoreIDs []string, err error) {
+	return vendorStoreIDs, err
+}
+
+func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string, storeID int64) (err error) {
+	return err
+}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
new file mode 100644
index 000000000..3e065e028
--- /dev/null
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -0,0 +1,165 @@
+package jdshop
+
+import (
+	"regexp"
+
+	"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
+)
+
+var (
+	sensitiveWordRegexp = regexp.MustCompile(`商品名称中含有敏感词(\[.*\])`)
+)
+
+func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (skuNameList []*partner.SkuNameInfo, err error) {
+
+	return skuNameList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return failedList, err
+}
+
+func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID int, vendorStoreID string) (cats []*partner.BareCategoryInfo, err error) {
+	return cats, err
+}
+
+func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return err
+}
+
+func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) {
+	if globals.EnableJdShopWrite {
+
+	}
+	return err
+}
+
+func (p *PurchaseHandler) IsErrSkuExist(err error) (isExist bool) {
+	return yinbaoapi.IsErrSkuExist(err)
+}
+
+func (p *PurchaseHandler) IsErrCategoryExist(err error) (isExist bool) {
+	return yinbaoapi.IsErrCategoryExist(err)
+}
+
+func (p *PurchaseHandler) IsErrCategoryNotExist(err error) (isNotExist bool) {
+	return false
+}
+
+func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
+	return 1
+}
+
+func (p *PurchaseHandler) GetSensitiveWordRegexp() *regexp.Regexp {
+	return sensitiveWordRegexp
+}
+
+func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
+	return yinbaoapi.IsErrSkuNotExist(err)
+}
+
+func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
+	if ybStatus == yinbaoapi.SkuStatusEnable {
+		jxSkuStatus = model.SkuStatusNormal
+	} else if ybStatus == yinbaoapi.SkuStatusDisabled {
+		jxSkuStatus = model.SkuStatusDontSale
+	} else if ybStatus == yinbaoapi.SkuStatusDeleted {
+		jxSkuStatus = model.SkuStatusDeleted
+	}
+	return jxSkuStatus
+}
+
+func vendorSku2Jx(result *yinbaoapi.QueryProductByBarcodeResult, resultp []*yinbaoapi.QueryProductImagesByBarcodeResult) (skuName *partner.SkuNameInfo) {
+	var picList []string
+	if result == nil {
+		globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
+		return nil
+	}
+	if len(resultp) > 0 {
+		if resultp[0].ImageURL != "" {
+			// for _, v := range resultp.Productimages {
+			picList = append(picList, resultp[0].ImageURL)
+			// }
+		}
+	}
+	prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(result.Name)
+	skuName = &partner.SkuNameInfo{
+		Prefix:    prefix,
+		Name:      name,
+		Unit:      unit,
+		YbBarCode: result.Barcode,
+		SkuList: []*partner.SkuInfo{
+			&partner.SkuInfo{
+				StoreSkuInfo: partner.StoreSkuInfo{
+					VendorSkuID: utils.Int64ToStr(result.UID),
+					Stock:       int(utils.Float64TwoInt64(result.Stock)),
+					VendorPrice: jxutils.StandardPrice2Int(result.SellPrice),
+					Status:      ybSkuStatus2Jx(result.Enable),
+				},
+				SkuName:     result.Name,
+				Comment:     comment,
+				SpecQuality: float64(specQuality),
+				SpecUnit:    specUnit,
+				Weight:      int(utils.Float64TwoInt64(float64(specQuality))),
+			},
+		},
+		PictureList: picList,
+	}
+	return skuName
+}

From 29f83461b77f7197d6edd8e30b69856b6c6e16c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:28:03 +0800
Subject: [PATCH 010/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/jds.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 7ce0b632d..536fb7a17 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -20,6 +20,7 @@ type PurchaseHandler struct {
 }
 
 func init() {
+	fmt.Println("test222222222222222222")
 	if api.JdShopAPI != nil {
 		fmt.Println("test111111111111111111111")
 		CurPurchaseHandler = New()
@@ -34,7 +35,7 @@ func New() (obj *PurchaseHandler) {
 }
 
 func (p *PurchaseHandler) GetVendorID() int {
-	return model.VendorIDYB
+	return model.VendorIDJDShop
 }
 
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {

From 232f186943e2a3878e72ce86b9c19ee777ebe369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:33:09 +0800
Subject: [PATCH 011/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/jds.go | 1 -
 main.go                                 | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 536fb7a17..1502b19c3 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -20,7 +20,6 @@ type PurchaseHandler struct {
 }
 
 func init() {
-	fmt.Println("test222222222222222222")
 	if api.JdShopAPI != nil {
 		fmt.Println("test111111111111111111111")
 		CurPurchaseHandler = New()
diff --git a/main.go b/main.go
index c3b567b5b..59532647a 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
+
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/yb"
 
 	"github.com/astaxie/beego"
@@ -77,6 +79,7 @@ func Init() {
 		ebai.CurPurchaseHandler.StartRefreshComment()
 		mtwm.CurPurchaseHandler.StartRefreshComment()
 		yb.CurPurchaseHandler.StartRefreshComment()
+		jdshop.CurPurchaseHandler.StartRefreshComment()
 	}
 	misc.Init()
 }

From 8494d429608891295c5f798eaa76c4bd23e67684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 17:51:31 +0800
Subject: [PATCH 012/285] =?UTF-8?q?getvendorstore=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go           | 1 +
 business/partner/purchase/jdshop/jds.go | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 49fbe37b9..0b73b2a2e 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -642,6 +642,7 @@ func getMapCenter(storeList []*StoreExt) (lng, lat float64) {
 
 func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorStoreID string) (retVal *StoreExt, err error) {
 	if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
+		fmt.Println("test1", handler)
 		result, err2 := handler.ReadStore(ctx, vendorOrgCode, vendorStoreID)
 		if err = err2; err == nil {
 			retVal = &StoreExt{
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 1502b19c3..7b7c74dd2 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -1,8 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
-
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
@@ -21,7 +19,6 @@ type PurchaseHandler struct {
 
 func init() {
 	if api.JdShopAPI != nil {
-		fmt.Println("test111111111111111111111")
 		CurPurchaseHandler = New()
 		partner.RegisterPurchasePlatform(CurPurchaseHandler)
 	}

From e48027a85c41990d1f8044dabd372c825ae4fcce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 8 May 2020 18:14:03 +0800
Subject: [PATCH 013/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                 |  4 +++-
 business/model/store.go                       |  5 +++--
 business/model/store_sku.go                   |  6 ++++--
 business/partner/purchase/jdshop/store_sku.go | 12 ++++++------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 0b73b2a2e..465b8cc95 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -641,8 +641,10 @@ func getMapCenter(storeList []*StoreExt) (lng, lat float64) {
 }
 
 func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorStoreID string) (retVal *StoreExt, err error) {
+	if vendorID == model.VendorIDJDShop && vendorStoreID == model.JdShopMainVendorStoreID {
+		return nil, err
+	}
 	if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
-		fmt.Println("test1", handler)
 		result, err2 := handler.ReadStore(ctx, vendorOrgCode, vendorStoreID)
 		if err = err2; err == nil {
 			retVal = &StoreExt{
diff --git a/business/model/store.go b/business/model/store.go
index 06e1f4250..ce942a06f 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -56,8 +56,9 @@ const (
 )
 
 const (
-	ExdStoreName  = "饿鲜达"
-	MatterStoreID = 666666
+	ExdStoreName            = "饿鲜达"
+	MatterStoreID           = 666666
+	JdShopMainVendorStoreID = "999999"
 )
 
 var (
diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index 719a34b37..563369660 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -52,8 +52,10 @@ type StoreSkuCategoryMap struct {
 	EbaiSyncStatus int8 `orm:"default(2)"`
 	MtwmSyncStatus int8 `orm:"default(2)"`
 	// WscSyncStatus  int8 `orm:"default(2)"`
-	YbID         int64 `orm:"column(yb_id);index"`
-	YbSyncStatus int8  `orm:"default(2)"`
+	YbID          int64 `orm:"column(yb_id);index"`
+	YbSyncStatus  int8  `orm:"default(2)"`
+	JdsID         int64 `orm:"column(jds_id);index"`
+	JdsSyncStatus int8  `orm:"default(2)"`
 }
 
 func (*StoreSkuCategoryMap) TableUnique() [][]string {
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 3e065e028..fd78cf265 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -19,21 +19,21 @@ var (
 )
 
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return failedList, err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return failedList, err
 }
 
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return failedList, err
@@ -70,21 +70,21 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 }
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return err
 }
 
 func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) {
-	if globals.EnableJdShopWrite {
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 
 	}
 	return err

From 17ddd46c1b53ce791a113c3a721df1a3b97b6da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 08:57:12 +0800
Subject: [PATCH 014/285] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 35 ++++++++++++++++++-
 business/partner/purchase/yb/store_sku.go     |  3 ++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fd78cf265..959b7b441 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,8 +1,13 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+
+	"git.rosy.net.cn/jx-callback/globals/api"
+
 	"git.rosy.net.cn/baseapi/platformapi/yinbaoapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -71,7 +76,35 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		fmt.Println("test1111111111111111111111", partner.GetMultiStoreVendorIDs())
+		var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
+		result, err := api.JdShopAPI.FindShopCategories()
+		if err != nil {
+			return err
+		}
+		for _, v := range result {
+			createShopCategoryParam := &jdshopapi.CreateShopCategoryParam{
+				HomeShow: "0",
+				ID:       utils.Int64ToStr(v.CID),
+				Open:     "",
+				OrderNo:  utils.Int2Str(v.OrderNo),
+				ParentID: utils.Int64ToStr(v.ParentCID),
+				Title:    v.Name,
+				Type:     jdshopapi.UpdateCatType,
+			}
+			createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam)
+		}
+		createShopCategoryParam2 := &jdshopapi.CreateShopCategoryParam{
+			HomeShow: "0",
+			ID:       "1",
+			Open:     "",
+			OrderNo:  utils.Int2Str(storeCat.Seq),
+			ParentID: storeCat.ParentVendorCatID,
+			Title:    storeCat.Name,
+			Type:     jdshopapi.CreateCatType,
+		}
+		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
+		err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	}
 	return err
 }
diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go
index 85b208608..5e2a5f59a 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -101,6 +101,9 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 		if len(storeSkuList) == 1 {
 			storeSku := storeSkuList[0]
 			result, err := api.YinBaoAPI.QueryProductByBarcode(storeSku.VendorSkuID)
+			if err != nil {
+				return nil, err
+			}
 			resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(result.Barcode)
 			// resultp, err := getProductImages(vendorStoreID, storeSku.VendorSkuID)
 			if err != nil {

From 797816abd3d58745d4ee786a7923b2e9a3ec2c99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 09:05:04 +0800
Subject: [PATCH 015/285] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index ad2b11225..eff45c71f 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -439,6 +439,9 @@ func AddStoreCategoryMap(db *DaoDB, storeID, categoryID int, vendorID int, vendo
 	} else if vendorID == model.VendorIDYB {
 		storeCat.YbID = utils.Str2Int64WithDefault(vendorCategoryID, 0)
 		storeCat.YbSyncStatus = status
+	} else if vendorID == model.VendorIDJDShop {
+		storeCat.JdsID = utils.Str2Int64WithDefault(vendorCategoryID, 0)
+		storeCat.JdsSyncStatus = status
 	} else {
 		panic("unsupported vendor")
 	}

From 46de6fa3b921b7d9274a0443bf1e951f025bcde7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 09:14:07 +0800
Subject: [PATCH 016/285] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E6=98=AF=E5=A4=9A?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=EF=BC=9F=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go                   |  1 +
 business/partner/purchase/jdshop/jds.go |  4 ++
 business/partner/purchase/jdshop/sku.go | 76 -------------------------
 business/partner/purchase/yb/sku.go     | 76 -------------------------
 business/partner/purchase/yb/yb.go      |  4 ++
 5 files changed, 9 insertions(+), 152 deletions(-)
 delete mode 100644 business/partner/purchase/jdshop/sku.go
 delete mode 100644 business/partner/purchase/yb/sku.go

diff --git a/business/model/sku.go b/business/model/sku.go
index cc374bc30..57b1110ba 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -154,6 +154,7 @@ type SkuCategory struct {
 	EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别
 	MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别
 	YbCategoryID   int64 `orm:"column(yb_category_id)" json:"ybCategoryID"`     // 这个是指对应的银豹商品类别
+	JdsCategoryID  int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"`   // 这个是指对应的京东商城类别
 
 	// ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别
 	// WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 7b7c74dd2..83883c17f 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -37,3 +37,7 @@ func (p *PurchaseHandler) GetVendorID() int {
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
 	return imgHint, err
 }
+
+func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
+	return vendorCats, err
+}
diff --git a/business/partner/purchase/jdshop/sku.go b/business/partner/purchase/jdshop/sku.go
deleted file mode 100644
index d60173580..000000000
--- a/business/partner/purchase/jdshop/sku.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package jdshop
-
-import (
-	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
-	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/business/partner"
-)
-
-func (p *PurchaseHandler) GetAllCategories(ctx *jxcontext.Context, vendorOrgCode string) (cats []*partner.BareCategoryInfo, err error) {
-	return cats, err
-}
-
-// func (p *PurchaseHandler) UpdateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
-// 	return nil
-// }
-
-// func (p *PurchaseHandler) DeleteCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
-// 	return nil
-// }
-
-// func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, userName string) (err error) {
-// 	return err
-// }
-
-func (p *PurchaseHandler) CreateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) UpdateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) DeleteCategory2(ctx *jxcontext.Context, vendorOrgCode, vendorCatID string) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCode, vendorParentCatID string, vendorCatIDList []string) (err error) {
-	return err
-}
-
-// func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-// func (p *PurchaseHandler) ReadSku(ctx *jxcontext.Context, vendorOrgCode, vendorSkuID string) (skuNameExt *model.SkuNameExt, err error) {
-// 	return skuNameExt, err
-// }
-
-// func (p *PurchaseHandler) UpdateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-// func (p *PurchaseHandler) DeleteSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-func (p *PurchaseHandler) CreateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) UpdateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) DeleteSku2(ctx *jxcontext.Context, vendorOrgCode string, sku *partner.StoreSkuInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
-	return vendorCats, err
-}
-
-func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, vendorOrgCode string, skuID int, vendorSkuID string) (skuNameList []*partner.SkuNameInfo, err error) {
-	return skuNameList, err
-}
diff --git a/business/partner/purchase/yb/sku.go b/business/partner/purchase/yb/sku.go
deleted file mode 100644
index 92e8d5f0f..000000000
--- a/business/partner/purchase/yb/sku.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package yb
-
-import (
-	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
-	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/business/partner"
-)
-
-func (p *PurchaseHandler) GetAllCategories(ctx *jxcontext.Context, vendorOrgCode string) (cats []*partner.BareCategoryInfo, err error) {
-	return cats, err
-}
-
-// func (p *PurchaseHandler) UpdateCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
-// 	return nil
-// }
-
-// func (p *PurchaseHandler) DeleteCategory(db *dao.DaoDB, cat *model.SkuCategory, userName string) error {
-// 	return nil
-// }
-
-// func (p *PurchaseHandler) ReorderCategories(db *dao.DaoDB, parentCatID int, userName string) (err error) {
-// 	return err
-// }
-
-func (p *PurchaseHandler) CreateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) UpdateCategory2(ctx *jxcontext.Context, cat *dao.SkuStoreCatInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) DeleteCategory2(ctx *jxcontext.Context, vendorOrgCode, vendorCatID string) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) ReorderCategories2(ctx *jxcontext.Context, vendorOrgCode, vendorParentCatID string, vendorCatIDList []string) (err error) {
-	return err
-}
-
-// func (p *PurchaseHandler) CreateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-// func (p *PurchaseHandler) ReadSku(ctx *jxcontext.Context, vendorOrgCode, vendorSkuID string) (skuNameExt *model.SkuNameExt, err error) {
-// 	return skuNameExt, err
-// }
-
-// func (p *PurchaseHandler) UpdateSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-// func (p *PurchaseHandler) DeleteSku(db *dao.DaoDB, sku *model.Sku, userName string) (err error) {
-// 	return err
-// }
-
-func (p *PurchaseHandler) CreateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) UpdateSku2(ctx *jxcontext.Context, sku *dao.StoreSkuSyncInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) DeleteSku2(ctx *jxcontext.Context, vendorOrgCode string, sku *partner.StoreSkuInfo) (err error) {
-	return err
-}
-
-func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
-	return vendorCats, err
-}
-
-func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, vendorOrgCode string, skuID int, vendorSkuID string) (skuNameList []*partner.SkuNameInfo, err error) {
-	return skuNameList, err
-}
diff --git a/business/partner/purchase/yb/yb.go b/business/partner/purchase/yb/yb.go
index 7f6518213..9c52f8b18 100644
--- a/business/partner/purchase/yb/yb.go
+++ b/business/partner/purchase/yb/yb.go
@@ -37,3 +37,7 @@ func (p *PurchaseHandler) GetVendorID() int {
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
 	return imgHint, err
 }
+
+func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
+	return vendorCats, err
+}

From d6962a27ef6b299c185832f6069a84cfb994bf40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 11:14:22 +0800
Subject: [PATCH 017/285] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=B1=BB=E7=9B=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  4 +-
 business/partner/purchase/jdshop/jds.go       | 15 ++++
 business/partner/purchase/jdshop/store_sku.go | 89 ++++++++++++-------
 3 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index eb462118b..afe41af53 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -433,7 +433,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 				}
 			} else {
 				if sku.MergedStatus == model.SkuStatusNormal {
-					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB {
+					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop {
 						globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
 					} else {
 						createList = append(createList, sku)
@@ -455,7 +455,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 				isAdded2Update := false
 				// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
 				if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
-					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB {
+					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop {
 						globals.SugarLogger.Warnf("syncStoreSkuNew 修改门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
 					} else {
 						isAdded2Update = true
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 83883c17f..26f901a3e 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
@@ -39,5 +40,19 @@ func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgUR
 }
 
 func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
+	result, err := api.JdShopAPI.FindVendorCategories()
+	for _, v := range result {
+		cat := &model.SkuVendorCategory{
+			VendorID:         model.VendorIDJDShop,
+			Name:             v.Name,
+			Level:            v.Lev,
+			VendorCategoryID: utils.Int2Str(v.ID),
+		}
+		if v.Lev > 1 {
+			cat.ParentID = utils.Int2Str(v.Fid)
+			cat.IsLeaf = 1
+		}
+		vendorCats = append(vendorCats, cat)
+	}
 	return vendorCats, err
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 959b7b441..59d35c2cc 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -71,64 +71,50 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
 }
 
 func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID int, vendorStoreID string) (cats []*partner.BareCategoryInfo, err error) {
+	result, err := api.JdShopAPI.FindShopCategories()
+	for _, v := range result {
+		var cat = &partner.BareCategoryInfo{
+			VendorCatID: utils.Int64ToStr(v.CID),
+			Name:        v.Name,
+		}
+		if v.ParentCID == 0 {
+			cat.Level = 1
+		} else {
+			cat.Level = 2
+		}
+		cats = append(cats, cat)
+	}
 	return cats, err
 }
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		fmt.Println("test1111111111111111111111", partner.GetMultiStoreVendorIDs())
-		var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
-		result, err := api.JdShopAPI.FindShopCategories()
-		if err != nil {
-			return err
-		}
-		for _, v := range result {
-			createShopCategoryParam := &jdshopapi.CreateShopCategoryParam{
-				HomeShow: "0",
-				ID:       utils.Int64ToStr(v.CID),
-				Open:     "",
-				OrderNo:  utils.Int2Str(v.OrderNo),
-				ParentID: utils.Int64ToStr(v.ParentCID),
-				Title:    v.Name,
-				Type:     jdshopapi.UpdateCatType,
-			}
-			createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam)
-		}
-		createShopCategoryParam2 := &jdshopapi.CreateShopCategoryParam{
-			HomeShow: "0",
-			ID:       "1",
-			Open:     "",
-			OrderNo:  utils.Int2Str(storeCat.Seq),
-			ParentID: storeCat.ParentVendorCatID,
-			Title:    storeCat.Name,
-			Type:     jdshopapi.CreateCatType,
-		}
-		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-		err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
+		err = updateOrCreateCategories(storeCat, true)
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		err = updateOrCreateCategories(storeCat, false)
 	}
 	return err
 }
 
 func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		_, err = api.JdShopAPI.DeleteShopCategory(utils.Str2Int64(vendorCatID))
 	}
 	return err
 }
 
 func (p *PurchaseHandler) IsErrSkuExist(err error) (isExist bool) {
-	return yinbaoapi.IsErrSkuExist(err)
+	return false
 }
 
 func (p *PurchaseHandler) IsErrCategoryExist(err error) (isExist bool) {
-	return yinbaoapi.IsErrCategoryExist(err)
+	return false
 }
 
 func (p *PurchaseHandler) IsErrCategoryNotExist(err error) (isNotExist bool) {
@@ -144,7 +130,7 @@ func (p *PurchaseHandler) GetSensitiveWordRegexp() *regexp.Regexp {
 }
 
 func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
-	return yinbaoapi.IsErrSkuNotExist(err)
+	return false
 }
 
 func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
@@ -196,3 +182,40 @@ func vendorSku2Jx(result *yinbaoapi.QueryProductByBarcodeResult, resultp []*yinb
 	}
 	return skuName
 }
+
+func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err error) {
+	var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
+	result, err := api.JdShopAPI.FindShopCategories()
+	if err != nil {
+		return err
+	}
+	for _, v := range result {
+		createShopCategoryParam := &jdshopapi.CreateShopCategoryParam{
+			HomeShow: "0",
+			ID:       utils.Int64ToStr(v.CID),
+			Open:     "",
+			OrderNo:  utils.Int2Str(v.OrderNo),
+			ParentID: utils.Int64ToStr(v.ParentCID),
+			Title:    v.Name,
+			Type:     jdshopapi.UpdateCatType,
+		}
+		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam)
+	}
+	createShopCategoryParam2 := &jdshopapi.CreateShopCategoryParam{
+		HomeShow: "0",
+		Open:     "",
+		OrderNo:  utils.Int2Str(storeCat.Seq),
+		ParentID: storeCat.ParentVendorCatID,
+		Title:    storeCat.Name,
+	}
+	if isCreate {
+		createShopCategoryParam2.Type = jdshopapi.CreateCatType
+		createShopCategoryParam2.ID = "1"
+	} else {
+		createShopCategoryParam2.Type = jdshopapi.UpdateCatType
+		createShopCategoryParam2.ID = storeCat.VendorCatID
+	}
+	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
+	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
+	return err
+}

From aa5874501308fe3b359dc347677bb51659393aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 11:21:08 +0800
Subject: [PATCH 018/285] =?UTF-8?q?jdshopapi=E8=AE=BE=E7=BD=AEcookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index d7412594e..1d6a0691e 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -307,7 +307,7 @@ func Init() {
 	api.MtwmAPI.SetCookieWithStr(mtwmCookieStr)
 	api.MtpsAPI.SetCookie("token", mtpsStoreToken)
 	api.JdAPI.SetJdCookie(JdStorePageCookie)
-	api.JdAPI.SetCookie("user", jdStorePageEarning)
+	api.JdShopAPI.SetCookie("user", jdStorePageEarning)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)

From 397a4c2a8ab206f304a3e35c29de76368d580810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 13:32:26 +0800
Subject: [PATCH 019/285] jdshopcookie

---
 business/jxstore/misc/misc.go                 | 2 +-
 business/partner/purchase/jdshop/store_sku.go | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 1d6a0691e..052cc38c3 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -307,7 +307,7 @@ func Init() {
 	api.MtwmAPI.SetCookieWithStr(mtwmCookieStr)
 	api.MtpsAPI.SetCookie("token", mtpsStoreToken)
 	api.JdAPI.SetJdCookie(JdStorePageCookie)
-	api.JdShopAPI.SetCookie("user", jdStorePageEarning)
+	api.JdShopAPI.SetCookie("thor", jdStorePageEarning)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 59d35c2cc..dcadafb0b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -89,7 +88,6 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		fmt.Println("test1111111111111111111111", partner.GetMultiStoreVendorIDs())
 		err = updateOrCreateCategories(storeCat, true)
 	}
 	return err

From f0413afd4ebf68972b0be4a25366edc08133da92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 14:36:35 +0800
Subject: [PATCH 020/285] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0jds?=
 =?UTF-8?q?hop=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index b57561713..31be0143c 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -397,7 +397,7 @@ jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
-jdShopAccessToken = "da8db492e20149e494afaf5607e1d6654zgi"
+jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
 

From 49a48893b237b12b7fe686486994088805538b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 14:47:28 +0800
Subject: [PATCH 021/285] =?UTF-8?q?jsshopapi=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index dcadafb0b..370a33429 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -214,6 +215,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
+	fmt.Println("test1111111111111111111111111111", api.JdShopAPI.GetCookie("thor"))
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From 0a92c39412b575c32c0c89f6aeef7b3d0244f27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 14:57:05 +0800
Subject: [PATCH 022/285] =?UTF-8?q?jsshopapi=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 370a33429..003e6deb7 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -215,7 +215,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-	fmt.Println("test1111111111111111111111111111", api.JdShopAPI.GetCookie("thor"))
+	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI, false))
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From 928c91a74272c6ee9ef26ab70c2a1fa8caeaf0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:01:29 +0800
Subject: [PATCH 023/285] =?UTF-8?q?jsshopapi=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 003e6deb7..128eb15f5 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -215,7 +215,8 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI, false))
+	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI.GetCookieCount(), false))
+	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI.APICookie, false))
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From df80169613d672791d3eb59d428d5f5d80dc82f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:11:33 +0800
Subject: [PATCH 024/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 6 +++++-
 business/partner/purchase/jdshop/store_sku.go | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 052cc38c3..c1dce8e8d 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -130,6 +130,7 @@ var (
 	yinbaoCookie                 string
 	feiePageCookie               string
 	jdStorePageEarning           string
+	jdsCookie                    string
 )
 
 func GetImportantTaskID(taskName string) string {
@@ -291,6 +292,9 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
+	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+		jdsCookie = configs[0].Value
+	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
@@ -307,7 +311,7 @@ func Init() {
 	api.MtwmAPI.SetCookieWithStr(mtwmCookieStr)
 	api.MtpsAPI.SetCookie("token", mtpsStoreToken)
 	api.JdAPI.SetJdCookie(JdStorePageCookie)
-	api.JdShopAPI.SetCookie("thor", jdStorePageEarning)
+	api.JdShopAPI.SetCookie("thor", jdsCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 128eb15f5..dcadafb0b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -215,8 +214,6 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI.GetCookieCount(), false))
-	fmt.Println("test11111111111111111111", utils.Format4Output(api.JdShopAPI.APICookie, false))
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From d9e52ea7bd343ac35a69dbf404e4a520bb6f45bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:15:00 +0800
Subject: [PATCH 025/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index c1dce8e8d..ceae9fb38 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -311,10 +311,11 @@ func Init() {
 	api.MtwmAPI.SetCookieWithStr(mtwmCookieStr)
 	api.MtpsAPI.SetCookie("token", mtpsStoreToken)
 	api.JdAPI.SetJdCookie(JdStorePageCookie)
-	api.JdShopAPI.SetCookie("thor", jdsCookie)
+	api.JdAPI.SetCookie("user", jdStorePageEarning)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
+	api.JdShopAPI.SetCookie("thor", jdsCookie)
 }
 
 func syncStoreSku() {

From 6e95aae0cbbee93162c206323b43b9c3a003513d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:22:09 +0800
Subject: [PATCH 026/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index dcadafb0b..202aab007 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -214,6 +214,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
+	api.JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F")
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From d8a33e08707b8940e48819ac5b615c798ef2f972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:24:57 +0800
Subject: [PATCH 027/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 202aab007..b2578fa33 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -214,7 +214,9 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-	api.JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F")
+	api.JdShopAPI.SetCookieWithStr(`
+	shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; shshshfp=9bdf0fa8739e15b3b3d0916874dc24bb; cid=NWtRMzk0NmpaMzc0N25DNDkwOHdaMTU2MWtYNDM0MnhJMDMwM2NCNDU4NGhQNjUy; __jdv=178324346|direct|-|none|-|1588730799613; __jdu=1142616513; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; language=zh_CN; ceshi3.com=000; csrf_token=39a1f47e-ef07-4062-ba94-4bdd038c5761; RT="z=1&dm=jd.com&si=06tzbwg87bul&ss=k9xo5wu0&sl=1&tt=2p9&ld=2qw&nu=bdba5d375dd6623f01453205f7799835&cl=a3u&ul=a9o&hd=asf"; isvName=shop_jxcs; assist=LGXT4ZUUMHZXSGOLGPNFIKRCRII44WUYF7T552S4PFARLRLIWLYWJZLSXMTJAY7O5GBTNINHWPBVU4IZGVN4JO5W3FZOSZ6JDF5RNOIZXOFJ5WXLP4FOWHZICZOXXQGQ6YUWKCT7THA2MLW5D3RC6F6ZUPM36WATR5FCZAHW3F3S5T7ZT2LHP5AWL5EI26QAYWGD7IALLH27O; track=677d8856-d442-ddc3-5d4e-aee66f5018ed; jshopPin=shop_jxcs; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5MFCGZYGW5XRTTNXOIGJ3UBPUN7T6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOM7M3MPSFOZ2PQGAERCQH4RXS2MV4TO3OVODFGHBUAM47BXLPP46IHCMEVCRKW4OZE; _lvtc_=BD5325FETC5J66JHRSRRFFWXWE; TrackID=1h3umkDNc_BgqSONMEymk1DZFyoNv7KBdNZYGWBoTrlyti9r_59naQmd2hYhAxdfVpUsEL3nvLyaPzOh5QoUU1-rmEDd4opyI0oM0u-ayHaQ; logining=1; thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; __jda=48732324.1142616513.1573036516.1588986492.1589005815.16; __jdc=48732324; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSBOFZX3ADTC6ASDKVLE4HKAWYYQ; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXBFZSIEGGC3GREOZ57KCKA3ERKO; JSESSIONID=7DB43A28ADC52B8C2B679218212E0F4F.s1; __jdb=48732324.19.1142616513|16.1589005815; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATNRXM5SIX62BZ6T5XXYBU4WCS3HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE3TS7MEO6Q2VM3DL3XSPUEYNM4P4NA7VLZHCQSBG44X3BDXUGVLG2EYRAH7P7RGPNG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBHIH3AY2GRQFROHUD6NU3DAFUJFA
+	`)
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From f9a5541e7ea7e66f482fa7675e885ba304f12d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:29:59 +0800
Subject: [PATCH 028/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 2 +-
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index ceae9fb38..e29558475 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookie("thor", jdsCookie)
+	// api.JdShopAPI.SetCookie("thor", jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index b2578fa33..ff5b17708 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -215,7 +215,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	api.JdShopAPI.SetCookieWithStr(`
-	shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; shshshfp=9bdf0fa8739e15b3b3d0916874dc24bb; cid=NWtRMzk0NmpaMzc0N25DNDkwOHdaMTU2MWtYNDM0MnhJMDMwM2NCNDU4NGhQNjUy; __jdv=178324346|direct|-|none|-|1588730799613; __jdu=1142616513; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; language=zh_CN; ceshi3.com=000; csrf_token=39a1f47e-ef07-4062-ba94-4bdd038c5761; RT="z=1&dm=jd.com&si=06tzbwg87bul&ss=k9xo5wu0&sl=1&tt=2p9&ld=2qw&nu=bdba5d375dd6623f01453205f7799835&cl=a3u&ul=a9o&hd=asf"; isvName=shop_jxcs; assist=LGXT4ZUUMHZXSGOLGPNFIKRCRII44WUYF7T552S4PFARLRLIWLYWJZLSXMTJAY7O5GBTNINHWPBVU4IZGVN4JO5W3FZOSZ6JDF5RNOIZXOFJ5WXLP4FOWHZICZOXXQGQ6YUWKCT7THA2MLW5D3RC6F6ZUPM36WATR5FCZAHW3F3S5T7ZT2LHP5AWL5EI26QAYWGD7IALLH27O; track=677d8856-d442-ddc3-5d4e-aee66f5018ed; jshopPin=shop_jxcs; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5MFCGZYGW5XRTTNXOIGJ3UBPUN7T6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOM7M3MPSFOZ2PQGAERCQH4RXS2MV4TO3OVODFGHBUAM47BXLPP46IHCMEVCRKW4OZE; _lvtc_=BD5325FETC5J66JHRSRRFFWXWE; TrackID=1h3umkDNc_BgqSONMEymk1DZFyoNv7KBdNZYGWBoTrlyti9r_59naQmd2hYhAxdfVpUsEL3nvLyaPzOh5QoUU1-rmEDd4opyI0oM0u-ayHaQ; logining=1; thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; __jda=48732324.1142616513.1573036516.1588986492.1589005815.16; __jdc=48732324; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSBOFZX3ADTC6ASDKVLE4HKAWYYQ; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXBFZSIEGGC3GREOZ57KCKA3ERKO; JSESSIONID=7DB43A28ADC52B8C2B679218212E0F4F.s1; __jdb=48732324.19.1142616513|16.1589005815; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATNRXM5SIX62BZ6T5XXYBU4WCS3HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE3TS7MEO6Q2VM3DL3XSPUEYNM4P4NA7VLZHCQSBG44X3BDXUGVLG2EYRAH7P7RGPNG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBHIH3AY2GRQFROHUD6NU3DAFUJFA
+	assist=LGXT4ZUUMHZXSGOLGPNFIKRCRII44WUYF7T552S4PFARLRLIWLYWJZLSXMTJAY7O5GBTNINHWPBVU4IZGVN4JO5W3FZOSZ6JDF5RNOIZXOFJ5WXLP4FOWHZICZOXXQGQ6YUWKCT7THA2MLW5D3RC6F6ZUPM36WATR5FCZAHW3F3S5T7ZT2LHP5AWL5EI26QAYWGD7IALLH27O; track=677d8856-d442-ddc3-5d4e-aee66f5018ed; jshopPin=shop_jxcs; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5MFCGZYGW5XRTTNXOIGJ3UBPUN7T6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOM7M3MPSFOZ2PQGAERCQH4RXS2MV4TO3OVODFGHBUAM47BXLPP46IHCMEVCRKW4OZE; _lvtc_=BD5325FETC5J66JHRSRRFFWXWE; TrackID=1h3umkDNc_BgqSONMEymk1DZFyoNv7KBdNZYGWBoTrlyti9r_59naQmd2hYhAxdfVpUsEL3nvLyaPzOh5QoUU1-rmEDd4opyI0oM0u-ayHaQ; logining=1; thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; __jda=48732324.1142616513.1573036516.1588986492.1589005815.16; __jdc=48732324; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSBOFZX3ADTC6ASDKVLE4HKAWYYQ; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXBFZSIEGGC3GREOZ57KCKA3ERKO; JSESSIONID=7DB43A28ADC52B8C2B679218212E0F4F.s1; __jdb=48732324.19.1142616513|16.1589005815; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATNRXM5SIX62BZ6T5XXYBU4WCS3HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE3TS7MEO6Q2VM3DL3XSPUEYNM4P4NA7VLZHCQSBG44X3BDXUGVLG2EYRAH7P7RGPNG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBHIH3AY2GRQFROHUD6NU3DAFUJFA
 	`)
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err

From a81755efc9fd5c1ad88901dc76a7ae7f99ec0e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:33:57 +0800
Subject: [PATCH 029/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ff5b17708..d6e204b7e 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -215,7 +215,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	api.JdShopAPI.SetCookieWithStr(`
-	assist=LGXT4ZUUMHZXSGOLGPNFIKRCRII44WUYF7T552S4PFARLRLIWLYWJZLSXMTJAY7O5GBTNINHWPBVU4IZGVN4JO5W3FZOSZ6JDF5RNOIZXOFJ5WXLP4FOWHZICZOXXQGQ6YUWKCT7THA2MLW5D3RC6F6ZUPM36WATR5FCZAHW3F3S5T7ZT2LHP5AWL5EI26QAYWGD7IALLH27O; track=677d8856-d442-ddc3-5d4e-aee66f5018ed; jshopPin=shop_jxcs; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5MFCGZYGW5XRTTNXOIGJ3UBPUN7T6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOM7M3MPSFOZ2PQGAERCQH4RXS2MV4TO3OVODFGHBUAM47BXLPP46IHCMEVCRKW4OZE; _lvtc_=BD5325FETC5J66JHRSRRFFWXWE; TrackID=1h3umkDNc_BgqSONMEymk1DZFyoNv7KBdNZYGWBoTrlyti9r_59naQmd2hYhAxdfVpUsEL3nvLyaPzOh5QoUU1-rmEDd4opyI0oM0u-ayHaQ; logining=1; thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; __jda=48732324.1142616513.1573036516.1588986492.1589005815.16; __jdc=48732324; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BSBOFZX3ADTC6ASDKVLE4HKAWYYQ; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXBFZSIEGGC3GREOZ57KCKA3ERKO; JSESSIONID=7DB43A28ADC52B8C2B679218212E0F4F.s1; __jdb=48732324.19.1142616513|16.1589005815; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATNRXM5SIX62BZ6T5XXYBU4WCS3HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE3TS7MEO6Q2VM3DL3XSPUEYNM4P4NA7VLZHCQSBG44X3BDXUGVLG2EYRAH7P7RGPNG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBHIH3AY2GRQFROHUD6NU3DAFUJFA
+	thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; 
 	`)
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err

From 90774e0d471ebebe723b4b392a00cd9f031b60a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:38:59 +0800
Subject: [PATCH 030/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 2 +-
 business/partner/purchase/jdshop/store_sku.go | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index e29558475..608b4521f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	// api.JdShopAPI.SetCookie("thor", jdsCookie)
+	api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d6e204b7e..dcadafb0b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -214,9 +214,6 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = storeCat.VendorCatID
 	}
 	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
-	api.JdShopAPI.SetCookieWithStr(`
-	thor=80FAF09E9A09B6E618A68057BDFCFCB8B87C1706FE86F2E8F20251DD598C89ABC8F03DCAB3F5BE7A0CDD0F812D17258CA4603C28541A12C7183F098906F2EBD451175D5A5E341996FDBE3D23CA1D8B847A98C67F3533705D0757AFF57A4B0B4D1D6AD40D1E4AD9AF90E6BE6F807C2802DF5072847E20C96602C459A17166562FF47B9F01900825FF8EFE50C0FA08092F; 
-	`)
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From 245408dedb9142da94746647a08744a4c7c7a827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 15:52:34 +0800
Subject: [PATCH 031/285] =?UTF-8?q?jdshopapi=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index dcadafb0b..a4dfd78ca 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -89,6 +89,15 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		err = updateOrCreateCategories(storeCat, true)
+		result, err := api.JdShopAPI.FindShopCategories()
+		if err != nil {
+			return err
+		}
+		for _, v := range result {
+			if v.Name == storeCat.Name {
+				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+			}
+		}
 	}
 	return err
 }

From 5b18255c56601af2efb15ef792c02e09354cb891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 16:06:12 +0800
Subject: [PATCH 032/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9C=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a4dfd78ca..177f56c0e 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -218,11 +218,16 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	if isCreate {
 		createShopCategoryParam2.Type = jdshopapi.CreateCatType
 		createShopCategoryParam2.ID = "1"
+		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	} else {
 		createShopCategoryParam2.Type = jdshopapi.UpdateCatType
 		createShopCategoryParam2.ID = storeCat.VendorCatID
+		for _, v := range createShopCategoryParams {
+			if v.ID == storeCat.VendorCatID {
+				v = createShopCategoryParam2
+			}
+		}
 	}
-	createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }

From a13e362943b130196968f3a4b6961a96505bd501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Sat, 9 May 2020 16:10:34 +0800
Subject: [PATCH 033/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9C=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 177f56c0e..ec0c7061c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -220,11 +220,10 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 		createShopCategoryParam2.ID = "1"
 		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	} else {
-		createShopCategoryParam2.Type = jdshopapi.UpdateCatType
-		createShopCategoryParam2.ID = storeCat.VendorCatID
 		for _, v := range createShopCategoryParams {
 			if v.ID == storeCat.VendorCatID {
-				v = createShopCategoryParam2
+				v.Title = createShopCategoryParam2.Title
+				v.OrderNo = createShopCategoryParam2.OrderNo
 			}
 		}
 	}

From 3de36ae02b0958c0ec027723708b09cf1c9d4a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 11 May 2020 09:16:44 +0800
Subject: [PATCH 034/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/jds.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 26f901a3e..8e77d688f 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -36,6 +36,7 @@ func (p *PurchaseHandler) GetVendorID() int {
 }
 
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
+
 	return imgHint, err
 }
 

From 1e2d85f3e59a94486a2d293a55b0a1c9483da0e8 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, 12 May 2020 11:00:27 +0800
Subject: [PATCH 035/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 12 ++---
 business/jxstore/cms/sync_store_sku.go        | 35 ++++++++++++---
 business/jxutils/jxutils.go                   | 39 ++++++++++++++++
 business/model/dao/store_sku.go               | 21 ++++++++-
 business/model/store_sku.go                   |  9 ++--
 business/partner/partner_store_sku.go         | 11 ++---
 business/partner/purchase/jdshop/store_sku.go | 44 ++++++++++++++++---
 7 files changed, 146 insertions(+), 25 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 073f93ddf..19c55f3c0 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -2555,12 +2555,14 @@ func RefershStoreSkusMidPrice(ctx *jxcontext.Context, storeIDs []int, isCountry
 			}
 			if len(priceReferList) > 0 {
 				//TODO 高于中位价20%才刷， 2020-05-08
-				if storeSku.UnitPrice > priceReferList[0].MidUnitPrice/payPercentage*120 {
-					skuBindInfo := &StoreSkuBindInfo{
-						NameID:    priceReferList[0].NameID,
-						UnitPrice: priceReferList[0].MidUnitPrice / payPercentage * 100,
+				if priceReferList[0].MidUnitPrice >= 500 {
+					if storeSku.UnitPrice > priceReferList[0].MidUnitPrice/payPercentage*120 {
+						skuBindInfo := &StoreSkuBindInfo{
+							NameID:    priceReferList[0].NameID,
+							UnitPrice: priceReferList[0].MidUnitPrice / payPercentage * 120,
+						}
+						skuBindInfos = append(skuBindInfos, skuBindInfo)
 					}
-					skuBindInfos = append(skuBindInfos, skuBindInfo)
 				}
 			}
 		}
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index afe41af53..3cdbe7dcf 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -231,11 +231,12 @@ func storeSkuSyncInfo2Bare(inSku *dao.StoreSkuSyncInfo) (outSku *partner.StoreSk
 		NameID:       inSku.NameID,
 		VendorNameID: inSku.VendorNameID,
 
-		Status:      inSku.MergedStatus,
-		VendorPrice: inSku.VendorPrice,
-		Seq:         inSku.Seq,
-		JxPrice:     inSku.Price,
-		JxUnitPrice: inSku.UnitPrice,
+		Status:       inSku.MergedStatus,
+		VendorPrice:  inSku.VendorPrice,
+		Seq:          inSku.Seq,
+		JxPrice:      inSku.Price,
+		JxUnitPrice:  inSku.UnitPrice,
+		VendorSkuID2: utils.Int2Str(inSku.JdsWareID),
 	}
 	if !isStoreSkuSyncNeedDelete(inSku) {
 		outSku.Stock = model.MaxStoreSkuStockQty
@@ -260,6 +261,15 @@ func getSkuBoxFee(vendorID int) (boxFee int64) {
 	return boxFee
 }
 
+func formalizeStoreSkuListForJds(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyncInfo {
+	if len(inSkuList) > 0 {
+		for _, skuItem := range inSkuList {
+			skuItem.SkuName = jxutils.ComposeSkuNameSync2(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
+		}
+	}
+	return inSkuList
+}
+
 func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyncInfo {
 	if len(inSkuList) > 0 {
 		boxFee := getSkuBoxFee(inSkuList[0].VendorID)
@@ -332,10 +342,20 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		if vendorID == model.VendorIDYB {
 			err = updateYbOhterSku(db, storeSkuList)
 		}
+		if vendorID == model.VendorIDJDShop {
+			err = updateJdsWareID(db, storeSkuList)
+		}
 	}
 	return num, err
 }
 
+func updateJdsWareID(db *dao.DaoDB, storeSkuList []*dao.StoreSkuSyncInfo) (err error) {
+	for _, v := range storeSkuList {
+		err = dao.UpdateJdsWareID(db, v)
+	}
+	return err
+}
+
 func updateYbOhterSku(db *dao.DaoDB, storeSkuList []*dao.StoreSkuSyncInfo) (err error) {
 	for _, v := range storeSkuList {
 		err = dao.UpdateYbOtherSku(db, v)
@@ -376,6 +396,11 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		skus = skus2
 	}
 	formalizeStoreSkuList(skus)
+	//京东商城的商品名规则不同
+	//name，空格，comment，约xxg
+	if vendorID == model.VendorIDJDShop {
+		formalizeStoreSkuListForJds(skus)
+	}
 
 	singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
 	storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index c28ce415e..723130186 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -359,6 +359,32 @@ func ComposeSkuNameOriginal(prefix, name, comment, unit string, spec_quality flo
 	return skuName
 }
 
+func ComposeSkuNameForJds(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int) (skuName string) {
+	strBuilder := &strings.Builder{}
+	if prefix != "" {
+		strBuilder.WriteString("[")
+		strBuilder.WriteString(prefix)
+		strBuilder.WriteString("]")
+	}
+	skuName += name
+	strBuilder.WriteString(name)
+	if comment != "" {
+		strBuilder.WriteString(" ")
+		strBuilder.WriteString(comment)
+	}
+	if unit == "份" {
+		strBuilder.WriteString("约")
+	}
+	if unit != "" {
+		strBuilder.WriteString(ComposeSkuSpec(spec_quality, spec_unit))
+	}
+	skuName = strBuilder.String()
+	if maxLen > 0 {
+		skuName = utils.LimitUTF8StringLen(skuName, maxLen)
+	}
+	return skuName
+}
+
 func ComposeSkuName(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int, exPrefix string, exPrefixBegin, exPrefixEnd *time.Time) (skuName string) {
 	if exPrefix != "" && exPrefixBegin != nil && exPrefixEnd != nil {
 		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
@@ -382,6 +408,19 @@ func ComposeSkuNameSync(prefix, name, comment, unit string, spec_quality float32
 	return skuName
 }
 
+func ComposeSkuNameSync2(prefix, name, comment, unit string, spec_quality float32, spec_unit string, maxLen int, exPrefix string, exPrefixBegin, exPrefixEnd *time.Time) (skuName string) {
+	if exPrefix != "" && exPrefixBegin != nil && exPrefixEnd != nil {
+		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixBegin) >= 0 && utils.Time2Date(time.Now()).Sub(*exPrefixEnd) <= 0 {
+			skuName = exPrefix
+		}
+		if utils.Time2Date(time.Now().Add(6*time.Hour)).Sub(*exPrefixEnd) > 0 {
+			skuName = ""
+		}
+	}
+	skuName += ComposeSkuNameForJds(prefix, name, comment, unit, spec_quality, spec_unit, maxLen)
+	return skuName
+}
+
 func ComposeSpuName(prefix, name string, maxLen int) (spuName string) {
 	if prefix != "" {
 		spuName = "[" + prefix + "]"
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 99a636f49..3a7e1b637 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -60,6 +60,7 @@ type StoreSkuSyncInfo struct {
 	StoreSkuStatus int
 	SkuSyncStatus  int8
 	VendorSkuID    string    `orm:"column(vendor_sku_id)"`
+	JdsWareID      int       `orm:"column(jds_ware_id)" json:"jdsWareID"`
 	BindDeletedAt  time.Time `orm:"type(datetime)" json:"bindDeletedAt"`
 
 	model.Sku
@@ -396,7 +397,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t14.vendor_id, t14.vendor_org_code, 
 	t1.id bind_id, t1.sku_id, t1.price, t1.unit_price, t1.status store_sku_status,
 	%s vendor_sku_id, t1.%s_sync_status sku_sync_status, t1.%s_price vendor_price, t1.%s_lock_time lock_time,
-	t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end,
+	t1.store_id, t1.deleted_at bind_deleted_at,t1.status_sale_begin,t1.status_sale_end, t1.jds_ware_id,
 	t2.*,
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id, t3.yb_name_suffix,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
@@ -1511,3 +1512,21 @@ func UpdateYbOtherSku(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error)
 	_, err = ExecuteSQL(db, sql, sqlParams)
 	return err
 }
+
+func UpdateJdsWareID(db *DaoDB, storeSkuSyncInfo *StoreSkuSyncInfo) (err error) {
+	sql := `
+		UPDATE store_sku_bind 
+		SET jds_ware_id = ?
+		WHERE store_id = ?
+		AND sku_id = ? 
+		AND deleted_at = ? 
+	`
+	sqlParams := []interface{}{
+		storeSkuSyncInfo.JdsWareID,
+		storeSkuSyncInfo.StoreID,
+		storeSkuSyncInfo.SkuID,
+		utils.DefaultTimeValue,
+	}
+	_, err = ExecuteSQL(db, sql, sqlParams)
+	return err
+}
diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index 563369660..239eda7a5 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -98,10 +98,11 @@ type StoreSkuBind struct {
 	Status     int
 
 	// ElmID  int64 `orm:"column(elm_id);index"`
-	MtwmID int64 `orm:"column(mtwm_id);index"`
-	EbaiID int64 `orm:"column(ebai_id);index"`
-	YbID   int64 `orm:"column(yb_id);index"`
-	JdsID  int64 `orm:"column(jds_id);index"`
+	MtwmID    int64 `orm:"column(mtwm_id);index"`
+	EbaiID    int64 `orm:"column(ebai_id);index"`
+	YbID      int64 `orm:"column(yb_id);index"`
+	JdsID     int64 `orm:"column(jds_id);index"`
+	JdsWareID int64 `orm:"column(jds_ware_id);index"`
 	// WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
 	// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId
 
diff --git a/business/partner/partner_store_sku.go b/business/partner/partner_store_sku.go
index 2d3f6111b..89867ba3c 100644
--- a/business/partner/partner_store_sku.go
+++ b/business/partner/partner_store_sku.go
@@ -46,11 +46,12 @@ type StoreSkuInfo struct {
 
 	Seq int `json:"seq,omitempty"`
 
-	ActPrice    int64  `json:"actPrice,omitempty"`
-	VendorActID string `json:"vendorActID,omitempty"`
-	IsSpecialty int    `json:"isSpecialty,omitempty"`
-	JxPrice     int64  `json:"jxPrice,omitempty"`
-	JxUnitPrice int64  `json:"jxUnitPrice,omitempty"`
+	ActPrice     int64  `json:"actPrice,omitempty"`
+	VendorActID  string `json:"vendorActID,omitempty"`
+	IsSpecialty  int    `json:"isSpecialty,omitempty"`
+	JxPrice      int64  `json:"jxPrice,omitempty"`
+	JxUnitPrice  int64  `json:"jxUnitPrice,omitempty"`
+	VendorSkuID2 string `json:"vendorSkuID2,omitempty"`
 }
 
 type StoreSkuInfoWithErr struct {
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ec0c7061c..2807b3160 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -15,6 +15,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/business/partner/putils"
 	"git.rosy.net.cn/jx-callback/globals"
 )
 
@@ -31,14 +32,29 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 
 func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		for _, v := range storeSkuList {
+			updateWareParam := &jdshopapi.UpdateWareParam{
+				WareID: v.JdsWareID,
+				Title:  v.SkuName,
+				Weight: v.Weight,
+			}
+			err = api.JdShopAPI.UpdateWare(updateWareParam)
+		}
+		if err != nil {
+			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
+		}
 	}
 	return failedList, err
 }
 
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		for _, v := range storeSkuList {
+			err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+		}
+		if err != nil {
+			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
+		}
 	}
 	return failedList, err
 }
@@ -50,14 +66,32 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite {
-
+		var stock = 0
+		for _, v := range storeSkuList {
+			if status == model.SkuStatusNormal {
+				stock = 9999
+			}
+			if vendorStoreID == model.JdShopMainVendorStoreID {
+				err = api.JdShopAPI.UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
+			} else {
+				err = api.JdShopAPI.UpdateSkuSiteStock(utils.Str2Int(v.VendorSkuID), stock, utils.Str2Int(vendorStoreID))
+			}
+		}
+		if err != nil {
+			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品库存")
+		}
 	}
 	return failedList, err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
-	if globals.EnableJdShopWrite {
-
+	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
+		for _, v := range storeSkuList {
+			err = api.JdShopAPI.UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), utils.Float64TwoInt(jxutils.IntPrice2Standard(v.VendorPrice)))
+		}
+		if err != nil {
+			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品价格")
+		}
 	}
 	return failedList, err
 }

From 7b05c7b87a8aa3e7db128ad12d9088ccf27489d3 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, 12 May 2020 15:36:04 +0800
Subject: [PATCH 036/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  2 +
 business/partner/purchase/jdshop/store_sku.go | 42 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 3cdbe7dcf..acfdde07a 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -460,6 +460,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 				if sku.MergedStatus == model.SkuStatusNormal {
 					if dao.IsVendorThingIDEmpty(sku.VendorCatID) && !strings.Contains(sku.StoreName, model.ExdStoreName) && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop {
 						globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有平台分类ID", storeID, sku.SkuID)
+					} else if dao.IsVendorThingIDEmpty(utils.Int64ToStr(sku.VendorVendorCatID)) && vendorID == model.VendorIDJDShop {
+						globals.SugarLogger.Warnf("syncStoreSkuNew 创建门店:%d商品:%d，但没有映射的平台ID", storeID, sku.SkuID)
 					} else {
 						createList = append(createList, sku)
 					}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 2807b3160..64fef555a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -25,7 +25,10 @@ var (
 
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-
+		for _, v := range storeSkuList {
+			buildCreateWareParam(v)
+			// api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+		}
 	}
 	return failedList, err
 }
@@ -264,3 +267,40 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
 	return err
 }
+
+func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
+	var images []*jdshopapi.CreateSkuParamImages
+	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
+		Title:         storeSku.SkuName,
+		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
+		CategoryID:    int(storeSku.VendorVendorCatID),
+		BrandID:       jdshopapi.JxBrandId,
+		TransportID:   jdshopapi.TransportID,
+		MobileDesc:    " ",
+		Introduction:  " ",
+		WareStatus:    8, //上架待审核
+		OuterID:       utils.Int2Str(storeSku.SkuID),
+		VenderID:      0,
+		Is7ToReturn:   0, //不支持7天退货
+		Length:        100,
+		Width:         100,
+		Height:        100,
+		Weight:        storeSku.Weight,
+		JdPrice:       int(storeSku.VendorPrice),
+		MarketPrice:   int(storeSku.Price),
+	}
+	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
+	api.JdShopAPI.UploadPicture(data, 0, storeSku.Name)
+	for i := 1; i < 3; i++ {
+		img := &jdshopapi.CreateSkuParamImages{
+			ColorID:  "0000000000",
+			ImgIndex: i,
+			ImgURL:   "",
+		}
+		images = append(images, img)
+	}
+	return createSkuParamWare, createSkuParamSkus, err
+}

From 5f901f8531d95c4939be84b654fced2537a571e4 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, 13 May 2020 09:43:27 +0800
Subject: [PATCH 037/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81=E5=BC=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                 |   4 +-
 business/jxstore/cms/sync.go                  |  57 ++++++---
 business/jxstore/cms/sync_store_sku.go        |  37 +++++-
 business/model/dao/store_sku.go               |   5 +-
 business/partner/partner.go                   |   2 +
 business/partner/purchase/ebai/store.go       |   8 ++
 business/partner/purchase/jd/store.go         |   8 ++
 business/partner/purchase/jdshop/store.go     |  19 +++
 business/partner/purchase/jdshop/store_sku.go | 121 ++++++++++++++++--
 business/partner/purchase/mtwm/store.go       |   8 ++
 business/partner/purchase/yb/store.go         |   8 ++
 11 files changed, 243 insertions(+), 34 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 465b8cc95..59bd8cadd 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1146,7 +1146,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	storeMap.Status = model.StoreStatusOpened
 	storeMap.DeliveryType = model.StoreDeliveryTypeByStore
 	storeMap.SyncStatus = 0
-	if vendorID != model.VendorIDJX && vendorID != model.VendorIDYB {
+	if vendorID != model.VendorIDJX && vendorID != model.VendorIDYB && vendorID != model.VendorIDJDShop {
 		if storeMap.VendorOrgCode == "" {
 			return nil, fmt.Errorf("必须指定平台分账号信息")
 		}
@@ -1170,6 +1170,8 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		if err != nil {
 			return nil, err
 		}
+	} else if vendorID == model.VendorIDJDShop {
+		storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
 	}
 	if err == nil {
 		dao.WrapAddIDCULDEntity(storeMap, userName)
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index b9b36a168..7e62cacd9 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -229,7 +229,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 		var failedList []*partner.StoreSkuInfoWithErr
 		handler := v.GetStoreHandler(loopMapInfo.VendorID)
 		if handler != nil {
-			if len(loopMapInfo.StoreMapList) > 1 {
+			if len(loopMapInfo.StoreMapList) > 0 {
 				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						var resultList []interface{}
@@ -238,29 +238,52 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 						if len(loopMapInfo.StoreMapList) > 1 {
 							db2 = dao.GetDB()
 						}
-						if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil {
-							storeMap.SyncStatus = 0
-							_, err = dao.UpdateEntity(db2, storeMap, model.FieldSyncStatus)
-							resultList = append(resultList, 1)
+						if model.IsSyncStatusNew(storeMap.SyncStatus) {
+							if err = handler.CreateStore2(db2, storeMap.StoreID, userName); err == nil {
+								resultList = append(resultList, 1)
+							} else {
+								failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "创建门店")
+							}
+						} else if model.IsSyncStatusDelete(storeMap.SyncStatus) {
+							if err = handler.DeleteStore(db2, storeMap.StoreID, userName); err == nil {
+								resultList = append(resultList, 1)
+							} else {
+								failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店")
+							}
 						} else {
-							failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "同步门店")
+							if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil {
+								resultList = append(resultList, 1)
+							} else {
+								failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "更新门店")
+							}
+						}
+						if err == nil {
+							storeMap.SyncStatus = 0
+							_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
 						}
 						return resultList, err
 					}, loopMapInfo.StoreMapList)
 				t.AddChild(loopStoreTask).Run()
 				resultList, err = loopStoreTask.GetResult(0)
-			} else {
-				storeMap := loopMapInfo.StoreMapList[0]
-				if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
-					storeMap.SyncStatus = 0
-					_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
-				} else {
-					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "同步门店")
-				}
-				if err == nil {
-					resultList = []interface{}{1}
-				}
 			}
+			// else {
+			// 	storeMap := loopMapInfo.StoreMapList[0]
+			// 	if model.IsSyncStatusNew(storeMap.SyncStatus) {
+
+			// 	} else if model.IsSyncStatusDelete(storeMap.SyncStatus) {
+
+			// 	} else {
+			// 		if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
+			// 			storeMap.SyncStatus = 0
+			// 			_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+			// 		} else {
+			// 			failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "更新门店")
+			// 		}
+			// 	}
+			// 	if err == nil {
+			// 		resultList = []interface{}{1}
+			// 	}
+			// }
 			err = partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}
 		if len(failedList) > 0 {
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index acfdde07a..5a8959a47 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -398,9 +398,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	formalizeStoreSkuList(skus)
 	//京东商城的商品名规则不同
 	//name，空格，comment，约xxg
-	if vendorID == model.VendorIDJDShop {
-		formalizeStoreSkuListForJds(skus)
-	}
+	// if vendorID == model.VendorIDJDShop {
+	// 	formalizeStoreSkuListForJds(skus)
+	// }
 
 	singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
 	storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
@@ -576,6 +576,14 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
 		}
 	}
+	//如果平台是京东商城，则按商品skuname创建
+	if vendorID == model.VendorIDJDShop {
+		if len(createList) > 0 {
+			rList := changeList2Jds(createList)
+			createList = createList[:]
+			createList = rList
+		}
+	}
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			step := batchItemList[0].(int)
@@ -1346,3 +1354,26 @@ func changeList2Yb(list1 []*dao.StoreSkuSyncInfo, list2 []*partner.StoreSkuInfo)
 	}
 	return rList1, rList2
 }
+
+func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo) {
+	var (
+		skuNameMap = make(map[int][]*dao.StoreSkuSyncInfo)
+	)
+	for _, v := range list {
+		skuNameMap[v.NameID] = append(skuNameMap[v.NameID], v)
+	}
+	for k, v := range skuNameMap {
+		storeSku := &dao.StoreSkuSyncInfo{
+			StoreSkuSyncInfoJds: v,
+		}
+		storeSku.NameID = k
+		storeSku.Name = v[0].Name
+		storeSku.VendorCatID = v[0].VendorCatID
+		storeSku.VendorVendorCatID = v[0].VendorVendorCatID
+		storeSku.UnitPrice = v[0].UnitPrice
+		storeSku.Img = v[0].Img
+		storeSku.Img2 = v[0].Img2
+		rList = append(rList, storeSku)
+	}
+	return rList
+}
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3a7e1b637..3b938c9d1 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -43,8 +43,9 @@ type SkuStoreCatInfo struct {
 }
 
 type StoreSkuSyncInfo struct {
-	VendorID      int    `orm:"column(vendor_id)" json:"vendorID"`
-	VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
+	StoreSkuSyncInfoJds []*StoreSkuSyncInfo
+	VendorID            int    `orm:"column(vendor_id)" json:"vendorID"`
+	VendorOrgCode       string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码，如果只有一个，可以为空
 
 	// 平台无关的store sku信息
 	BindID  int `orm:"column(bind_id)"` // 换名的原因是与Sku.ID同名区别
diff --git a/business/partner/partner.go b/business/partner/partner.go
index 97928dc65..d55b58383 100644
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -147,6 +147,8 @@ type IPurchasePlatformHandler interface {
 	// Store
 	ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (store *dao.StoreDetail, err error)
 	UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error)
+	CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error)
+	DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error)
 	GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (storeStatus int, err error)
 	UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string, storeID int64) (err error)
 
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 8361b7182..00418af6b 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -534,3 +534,11 @@ func (c *PurchaseHandler) GetShopIDsByPage() (vendorStoreIDs []string, err error
 	}
 	return vendorStoreIDs, err
 }
+
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index a4fffb315..0da3a7740 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -498,3 +498,11 @@ func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgC
 	}
 	return err
 }
+
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index de87f3149..e3a1e368c 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -1,9 +1,12 @@
 package jdshop
 
 import (
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
+	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (storeDetail *dao.StoreDetail, err error) {
@@ -15,6 +18,22 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	return err
 }
 
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+	store, err := dao.GetStoreDetail(db, storeID, model.VendorIDJDShop)
+	if err != nil {
+		return err
+	}
+	createEntityStoreParam := &jdshopapi.CreateEntityStoreParam{
+		Name: store.Name,
+	}
+	err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
 func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
 	return hint, err
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 64fef555a..e259ff5c3 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,6 +2,7 @@ package jdshop
 
 import (
 	"regexp"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -279,28 +280,126 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		MobileDesc:    " ",
 		Introduction:  " ",
 		WareStatus:    8, //上架待审核
-		OuterID:       utils.Int2Str(storeSku.SkuID),
+		OuterID:       utils.Int2Str(storeSku.NameID),
 		VenderID:      0,
 		Is7ToReturn:   0, //不支持7天退货
 		Length:        100,
 		Width:         100,
 		Height:        100,
-		Weight:        storeSku.Weight,
-		JdPrice:       int(storeSku.VendorPrice),
-		MarketPrice:   int(storeSku.Price),
+		Weight:        500,
+		JdPrice:       int(storeSku.UnitPrice),
+		MarketPrice:   int(storeSku.UnitPrice),
 	}
+
+	//上传京东图片 start
+	//规则，有两张就传两张，没有就重复传一张
 	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
 	if err != nil {
 		return createSkuParamWare, createSkuParamSkus, err
 	}
-	api.JdShopAPI.UploadPicture(data, 0, storeSku.Name)
-	for i := 1; i < 3; i++ {
-		img := &jdshopapi.CreateSkuParamImages{
-			ColorID:  "0000000000",
-			ImgIndex: i,
-			ImgURL:   "",
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
+	img1 := &jdshopapi.CreateSkuParamImages{
+		ColorID:  "0000000000",
+		ImgIndex: 1,
+		ImgURL:   uploadResult.PictureURL,
+	}
+	img2 := &jdshopapi.CreateSkuParamImages{
+		ColorID:  "0000000000",
+		ImgIndex: 2,
+	}
+	if storeSku.Img2 == "" {
+		img2.ImgURL = uploadResult.PictureURL
+	} else {
+		data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
 		}
-		images = append(images, img)
+		uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
+		}
+		img2.ImgURL = uploadResult2.PictureURL
+	}
+	images = append(images, img1)
+	images = append(images, img2)
+	createSkuParamWare.Images = images
+	//end
+
+	//设置商品属性值
+	var (
+		attrIDs     = make(map[string]int) //贮存方式,净含量,保质期IDs
+		zctjValueID int64                  //贮存条件冷藏0-4的id
+		attrsProp   []*jdshopapi.CreateSkuParamAttrs
+	)
+	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
+	for _, v := range attrs {
+		if v.Name == "保质期" {
+			attrIDs[v.Name] = v.ID
+		} else if v.Name == "贮存条件" {
+			attrIDs[v.Name] = v.ID
+		} else if v.Name == "净含量" {
+			attrIDs[v.Name] = v.ID
+		} else if v.Name == "规格" {
+			attrIDs[v.Name] = v.ID
+		}
+	}
+	values, _, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["贮存条件"])
+	for _, v := range values {
+		if v.Name == "冷藏 0-4℃" {
+			zctjValueID = v.ID
+		}
+	}
+	attrZctj := &jdshopapi.CreateSkuParamAttrs{
+		AttrID:     utils.Int2Str(attrIDs["贮存条件"]),
+		AttrValues: []string{utils.Int64ToStr(zctjValueID)},
+	}
+	attrJhl := &jdshopapi.CreateSkuParamAttrs{
+		AttrID:     utils.Int2Str(attrIDs["净含量"]),
+		AttrValues: []string{"0.5"},
+	}
+	attrBzq := &jdshopapi.CreateSkuParamAttrs{
+		AttrID:     utils.Int2Str(attrIDs["保质期"]),
+		AttrValues: []string{"5"},
+	}
+	attrsProp = append(attrsProp, attrZctj)
+	attrsProp = append(attrsProp, attrJhl)
+	attrsProp = append(attrsProp, attrBzq)
+	createSkuParamWare.MultiCateProps = attrsProp
+
+	//组合sku
+	var (
+		ggValueID    int64 //规格的属性id
+		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+	)
+	valuesSku, maxNo, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
+	for _, v := range storeSku.StoreSkuSyncInfoJds {
+		specQuality := utils.Int2Str(storeSku.Weight) + storeSku.SpecUnit
+		for _, v := range valuesSku {
+			if v.Name == specQuality {
+				ggValueID = v.ID
+			}
+		}
+		if ggValueID == 0 { //说明没有建这个规格，要建上
+			catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
+			ggValueID = catID
+		}
+		attrSku := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(attrIDs["规格"]),
+			AttrValues: []string{utils.Int64ToStr(ggValueID)},
+		}
+		attrsPropSku = append(attrsPropSku, attrSku)
+		sku := &jdshopapi.CreateSkuParamSkus{
+			JdPrice:  int(v.VendorPrice),
+			StockNum: 9999,
+			Type:     "com.jd.pop.ware.ic.api.domain.sku",
+			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",
+			OuterID:  utils.Int2Str(v.SkuID),
+		}
+		sku.SaleAttrs = attrsPropSku
+		createSkuParamSkus = append(createSkuParamSkus, sku)
 	}
 	return createSkuParamWare, createSkuParamSkus, err
 }
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index 3e5a7409b..a913e180d 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -96,6 +96,14 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
 	return p.UpdateStore(db, storeID, userName)
 }
 
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
 	var name string
 	if db == nil {
diff --git a/business/partner/purchase/yb/store.go b/business/partner/purchase/yb/store.go
index fea030fb1..f66938e20 100644
--- a/business/partner/purchase/yb/store.go
+++ b/business/partner/purchase/yb/store.go
@@ -15,6 +15,14 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	return err
 }
 
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
+func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	return err
+}
+
 func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {
 	return hint, err
 }

From 7fcb6e536e19421a8203c6e332fab175f6c34341 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, 13 May 2020 10:27:03 +0800
Subject: [PATCH 038/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=9B=E5=BB=BA=E6=9B=B4=E6=96=B0id?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        | 35 +++++++++++--------
 business/model/dao/store_sku.go               |  2 +-
 business/partner/purchase/jdshop/store_sku.go | 24 +++++++++++--
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 5a8959a47..a63ed6bf7 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -236,7 +236,7 @@ func storeSkuSyncInfo2Bare(inSku *dao.StoreSkuSyncInfo) (outSku *partner.StoreSk
 		Seq:          inSku.Seq,
 		JxPrice:      inSku.Price,
 		JxUnitPrice:  inSku.UnitPrice,
-		VendorSkuID2: utils.Int2Str(inSku.JdsWareID),
+		VendorSkuID2: utils.Int64ToStr(inSku.JdsWareID),
 	}
 	if !isStoreSkuSyncNeedDelete(inSku) {
 		outSku.Stock = model.MaxStoreSkuStockQty
@@ -334,26 +334,31 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// 		panic(r)
 		// 	}
 		// }()
-		updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
-		for k, v := range storeSkuList {
-			updateItemList[k] = sku2Update(vendorID, v, syncStatus)
-		}
-		num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
-		if vendorID == model.VendorIDYB {
-			err = updateYbOhterSku(db, storeSkuList)
-		}
 		if vendorID == model.VendorIDJDShop {
-			err = updateJdsWareID(db, storeSkuList)
+			for _, v := range storeSkuList {
+				updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
+				for k, vv := range v.StoreSkuSyncInfoJds {
+					updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
+					err = updateJdsWareID(db, vv)
+				}
+				num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
+			}
+		} else {
+			updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
+			for k, v := range storeSkuList {
+				updateItemList[k] = sku2Update(vendorID, v, syncStatus)
+			}
+			num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
+			if vendorID == model.VendorIDYB {
+				err = updateYbOhterSku(db, storeSkuList)
+			}
 		}
 	}
 	return num, err
 }
 
-func updateJdsWareID(db *dao.DaoDB, storeSkuList []*dao.StoreSkuSyncInfo) (err error) {
-	for _, v := range storeSkuList {
-		err = dao.UpdateJdsWareID(db, v)
-	}
-	return err
+func updateJdsWareID(db *dao.DaoDB, storeSku *dao.StoreSkuSyncInfo) (err error) {
+	return dao.UpdateJdsWareID(db, storeSku)
 }
 
 func updateYbOhterSku(db *dao.DaoDB, storeSkuList []*dao.StoreSkuSyncInfo) (err error) {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3b938c9d1..1c503a708 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -61,7 +61,7 @@ type StoreSkuSyncInfo struct {
 	StoreSkuStatus int
 	SkuSyncStatus  int8
 	VendorSkuID    string    `orm:"column(vendor_sku_id)"`
-	JdsWareID      int       `orm:"column(jds_ware_id)" json:"jdsWareID"`
+	JdsWareID      int64     `orm:"column(jds_ware_id)" json:"jdsWareID"`
 	BindDeletedAt  time.Time `orm:"type(datetime)" json:"bindDeletedAt"`
 
 	model.Sku
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index e259ff5c3..0dd729988 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -27,8 +27,28 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			buildCreateWareParam(v)
-			// api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
+			if err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			}
+			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+			if err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			}
+			v.JdsWareID = createSkuResult.WareID
+			for _, vv2 := range v.StoreSkuSyncInfoJds {
+				for _, vv := range createSkuParamSkus {
+					for _, vvv := range vv.SaleAttrs {
+						for _, vv1 := range createSkuResult.Skus {
+							for _, vvv1 := range vv1.SaleAttrs {
+								if vvv1.AttrValues[0] == vvv.AttrValues[0] {
+									vv2.VendorSkuID = utils.Int64ToStr(vv1.SkuID)
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 	return failedList, err

From 6e4ee330912d6ace621eb4ea7550a3fe2cdaf1fd 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, 13 May 2020 10:53:48 +0800
Subject: [PATCH 039/285] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 6 +++---
 business/partner/purchase/jdshop/store_sku.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 19c55f3c0..4d7248c0c 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -538,9 +538,9 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	t4.created_at bind_created_at, t4.updated_at bind_updated_at, t4.last_operator bind_last_operator, t4.deleted_at bind_deleted_at,
 	t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at,
 	t4.ebai_id, t4.mtwm_id, t4.yb_id, CONCAT(smm.yb_store_prefix,t1.yb_name_suffix) yb_sku_name,
-	t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.yb_sync_status,
-	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price,
-	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time,
+	t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.yb_sync_status, t4.jds_sync_status,
+	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price, t4.jds_price,
+	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time, t4.jds_lock_time,
 	t4.status_sale_begin, t4.status_sale_end,
 	t6.mid_unit_price real_mid_unit_price
 	` + sql
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 0dd729988..26cac1483 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -297,8 +297,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
 		TransportID:   jdshopapi.TransportID,
-		MobileDesc:    " ",
-		Introduction:  " ",
+		MobileDesc:    "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解",
+		Introduction:  "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解",
 		WareStatus:    8, //上架待审核
 		OuterID:       utils.Int2Str(storeSku.NameID),
 		VenderID:      0,

From 20754c2e802c1253ca206bc499dc3a7d5a084a65 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, 13 May 2020 10:57:27 +0800
Subject: [PATCH 040/285] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 26cac1483..a96e70ab6 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -292,7 +292,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
 	var images []*jdshopapi.CreateSkuParamImages
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
-		Title:         storeSku.SkuName,
+		Title:         storeSku.Name,
 		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,

From 76dfa1a0d74fea515ad046609a63a99acd9bceff 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, 13 May 2020 11:12:57 +0800
Subject: [PATCH 041/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a96e70ab6..76f699ad3 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"time"
 
@@ -30,10 +31,12 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
 			if err != nil {
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+				return failedList, err
 			}
 			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
 			if err != nil {
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+				return failedList, err
 			}
 			v.JdsWareID = createSkuResult.WareID
 			for _, vv2 := range v.StoreSkuSyncInfoJds {
@@ -391,17 +394,19 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 
 	//组合sku
 	var (
-		ggValueID    int64 //规格的属性id
-		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+		ggValueID int64 //规格的属性id
 	)
 	valuesSku, maxNo, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
+		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		specQuality := utils.Int2Str(storeSku.Weight) + storeSku.SpecUnit
+		fmt.Println("test11111111111111111111111", utils.Format4Output(storeSku, false))
 		for _, v := range valuesSku {
 			if v.Name == specQuality {
 				ggValueID = v.ID
 			}
 		}
+		fmt.Println("test11111111111111111111111", ggValueID)
 		if ggValueID == 0 { //说明没有建这个规格，要建上
 			catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
 			ggValueID = catID

From a7e4eae799ea1b5070eb2ba379bf5ea55db7f133 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, 13 May 2020 11:22:43 +0800
Subject: [PATCH 042/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        | 1 +
 business/partner/purchase/jdshop/store_sku.go | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index a63ed6bf7..946993f57 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1367,6 +1367,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 	for _, v := range list {
 		skuNameMap[v.NameID] = append(skuNameMap[v.NameID], v)
 	}
+	fmt.Println("test11111111111111", utils.Format4Output(skuNameMap, false))
 	for k, v := range skuNameMap {
 		storeSku := &dao.StoreSkuSyncInfo{
 			StoreSkuSyncInfoJds: v,
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 76f699ad3..0c41f1e6a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -399,14 +399,14 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	valuesSku, maxNo, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
-		specQuality := utils.Int2Str(storeSku.Weight) + storeSku.SpecUnit
-		fmt.Println("test11111111111111111111111", utils.Format4Output(storeSku, false))
+		specQuality := utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit
+		fmt.Println("test2222222222222222222222", utils.Format4Output(storeSku, false))
 		for _, v := range valuesSku {
 			if v.Name == specQuality {
 				ggValueID = v.ID
 			}
 		}
-		fmt.Println("test11111111111111111111111", ggValueID)
+		// fmt.Println("test11111111111111111111111", ggValueID)
 		if ggValueID == 0 { //说明没有建这个规格，要建上
 			catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
 			ggValueID = catID

From a99626e60071a5825e01a30a0031a9fb0d065c75 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, 13 May 2020 11:25:45 +0800
Subject: [PATCH 043/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        | 2 +-
 business/partner/purchase/jdshop/store_sku.go | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 946993f57..aae28c498 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1367,7 +1367,6 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 	for _, v := range list {
 		skuNameMap[v.NameID] = append(skuNameMap[v.NameID], v)
 	}
-	fmt.Println("test11111111111111", utils.Format4Output(skuNameMap, false))
 	for k, v := range skuNameMap {
 		storeSku := &dao.StoreSkuSyncInfo{
 			StoreSkuSyncInfoJds: v,
@@ -1381,5 +1380,6 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.Img2 = v[0].Img2
 		rList = append(rList, storeSku)
 	}
+	fmt.Println("test11111111111111", utils.Format4Output(rList, false))
 	return rList
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 0c41f1e6a..808a1ef55 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"time"
 
@@ -400,7 +399,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		specQuality := utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit
-		fmt.Println("test2222222222222222222222", utils.Format4Output(storeSku, false))
+		// fmt.Println("test2222222222222222222222", utils.Format4Output(storeSku, false))
 		for _, v := range valuesSku {
 			if v.Name == specQuality {
 				ggValueID = v.ID

From 38cd09ef5abcb1e4cbaad3c784cd99aa9a129bb1 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, 13 May 2020 11:30:19 +0800
Subject: [PATCH 044/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        | 1 -
 business/partner/purchase/jdshop/store_sku.go | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index aae28c498..a63ed6bf7 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1380,6 +1380,5 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.Img2 = v[0].Img2
 		rList = append(rList, storeSku)
 	}
-	fmt.Println("test11111111111111", utils.Format4Output(rList, false))
 	return rList
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 808a1ef55..100717f9d 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"time"
 
@@ -399,13 +400,13 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		specQuality := utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit
-		// fmt.Println("test2222222222222222222222", utils.Format4Output(storeSku, false))
+		fmt.Println("test11111111111111111111111", utils.Format4Output(valuesSku, false))
 		for _, v := range valuesSku {
 			if v.Name == specQuality {
+				fmt.Println("test22222222222222222222222222222", specQuality)
 				ggValueID = v.ID
 			}
 		}
-		// fmt.Println("test11111111111111111111111", ggValueID)
 		if ggValueID == 0 { //说明没有建这个规格，要建上
 			catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
 			ggValueID = catID

From 90d966d4acaa877776ea82743a344c717de83451 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, 13 May 2020 11:32:33 +0800
Subject: [PATCH 045/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 100717f9d..d798f1f74 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"time"
 
@@ -399,11 +398,9 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	valuesSku, maxNo, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
-		specQuality := utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit
-		fmt.Println("test11111111111111111111111", utils.Format4Output(valuesSku, false))
+		specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
 		for _, v := range valuesSku {
 			if v.Name == specQuality {
-				fmt.Println("test22222222222222222222222222222", specQuality)
 				ggValueID = v.ID
 			}
 		}

From 5c41a5ebc8d24e1f844950006a877c40f8d51c7c 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, 13 May 2020 11:33:28 +0800
Subject: [PATCH 046/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d798f1f74..a0a272910 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -420,6 +420,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",
 			OuterID:  utils.Int2Str(v.SkuID),
 		}
+
 		sku.SaleAttrs = attrsPropSku
 		createSkuParamSkus = append(createSkuParamSkus, sku)
 	}

From 282e9736c634454d1fd28d1a124b6c303a2ea1e3 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, 13 May 2020 11:38:06 +0800
Subject: [PATCH 047/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a0a272910..d2ec6c09d 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -395,8 +395,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	var (
 		ggValueID int64 //规格的属性id
 	)
-	valuesSku, maxNo, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
+		valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
 		for _, v := range valuesSku {

From c6476faccb48149328ed9ecd21364aaf9ab5aad6 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, 13 May 2020 11:41:14 +0800
Subject: [PATCH 048/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d2ec6c09d..02b20e5a5 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -392,12 +392,12 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	createSkuParamWare.MultiCateProps = attrsProp
 
 	//组合sku
-	var (
-		ggValueID int64 //规格的属性id
-	)
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
+		var (
+			ggValueID    int64 //规格的属性id
+			attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+		)
 		valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
-		var attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
 		for _, v := range valuesSku {
 			if v.Name == specQuality {

From 335e8a0806407271063f22941aa230cb599018cb 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, 13 May 2020 14:52:12 +0800
Subject: [PATCH 049/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  2 +-
 business/partner/purchase/jdshop/store_sku.go | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index a63ed6bf7..9b92458ed 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -402,7 +402,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	}
 	formalizeStoreSkuList(skus)
 	//京东商城的商品名规则不同
-	//name，空格，comment，约xxg
+	// name，空格，comment，约xxg
 	// if vendorID == model.VendorIDJDShop {
 	// 	formalizeStoreSkuListForJds(skus)
 	// }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 02b20e5a5..a490b8074 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -292,27 +292,29 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 }
 
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
-	var images []*jdshopapi.CreateSkuParamImages
+	var (
+		images []*jdshopapi.CreateSkuParamImages
+		desc   string
+	)
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
 		Title:         storeSku.Name,
 		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
 		TransportID:   jdshopapi.TransportID,
-		MobileDesc:    "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解",
-		Introduction:  "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解",
 		WareStatus:    8, //上架待审核
 		OuterID:       utils.Int2Str(storeSku.NameID),
 		VenderID:      0,
-		Is7ToReturn:   0, //不支持7天退货
 		Length:        100,
 		Width:         100,
 		Height:        100,
 		Weight:        500,
-		JdPrice:       int(storeSku.UnitPrice),
-		MarketPrice:   int(storeSku.UnitPrice),
+		JdPrice:       int(storeSku.UnitPrice) / 100,
+		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-
+	desc = "<img src=\"" + jdshopapi.JdsImgURL + storeSku.DescImg + "\" style=\"width: auto; height: auto; max-width: 100%;\">"
+	createSkuParamWare.MobileDesc = desc
+	createSkuParamWare.Introduction = desc
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
 	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
@@ -390,6 +392,13 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	attrsProp = append(attrsProp, attrJhl)
 	attrsProp = append(attrsProp, attrBzq)
 	createSkuParamWare.MultiCateProps = attrsProp
+	var features []*jdshopapi.CreateSkuParamFeatures
+	feature := &jdshopapi.CreateSkuParamFeatures{
+		Key:   "is7ToReturn", //不支持7天无理由退货
+		Value: "0",
+	}
+	features = append(features, feature)
+	createSkuParamWare.Features = features
 
 	//组合sku
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
@@ -414,7 +423,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsPropSku = append(attrsPropSku, attrSku)
 		sku := &jdshopapi.CreateSkuParamSkus{
-			JdPrice:  int(v.VendorPrice),
+			JdPrice:  int(v.VendorPrice) / 100,
 			StockNum: 9999,
 			Type:     "com.jd.pop.ware.ic.api.domain.sku",
 			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",

From e31afd68d920c23fdc6e4552160ebc6a14e50746 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, 13 May 2020 15:00:31 +0800
Subject: [PATCH 050/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 1c503a708..7e6d268e6 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -526,7 +526,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	t13.%s desc_img,
+	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	t4m.sync_status cat_sync_status, t4m.vendor_thing_id vendor_cat_id,
 	t5skum.sync_status sku_cat_sync_status, t5skum.vendor_thing_id sku_vendor_cat_id

From 68819dcc298424a3c746d98052d3b80894810ebb 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, 13 May 2020 15:08:14 +0800
Subject: [PATCH 051/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go               | 2 +-
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 7e6d268e6..3c3814699 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -403,7 +403,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id, t3.yb_name_suffix,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	t13.%s desc_img,
+	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	ts.name store_name`
 	fmtParams := []interface{}{
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a490b8074..618a183a5 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -312,7 +312,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	desc = "<img src=\"" + jdshopapi.JdsImgURL + storeSku.DescImg + "\" style=\"width: auto; height: auto; max-width: 100%;\">"
+	desc = "<img src=\"" + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + "\" style=\"width: auto; height: auto; max-width: 100%;\">"
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc
 	//上传京东图片 start

From 95f91975a84073264c9ca28af01aa4cf78dbcd17 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, 13 May 2020 15:15:27 +0800
Subject: [PATCH 052/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3c3814699..57bbcdc65 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -410,7 +410,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		fieldPrefix,
 	}
 	if isSingleStorePF {

From 89ee3c13e48df342182c584342c0b790681bb20d 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, 13 May 2020 15:19:04 +0800
Subject: [PATCH 053/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 618a183a5..2281cd105 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -312,7 +312,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	desc = "<img src=\"" + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + "\" style=\"width: auto; height: auto; max-width: 100%;\">"
+	desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style=\"width: auto; height: auto; max-width: 100%;\">`
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc
 	//上传京东图片 start

From 8387b5427205c355ca7f1a02349f320a82598426 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, 13 May 2020 15:22:14 +0800
Subject: [PATCH 054/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 2281cd105..b45d0db6d 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -312,7 +312,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style=\"width: auto; height: auto; max-width: 100%;\">`
+	desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style="width: auto; height: auto; max-width: 100%;">`
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc
 	//上传京东图片 start

From 984f326b5160c5ae2d9dd27b147a5da5620900aa 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, 13 May 2020 15:24:21 +0800
Subject: [PATCH 055/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index b45d0db6d..e661824d5 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -294,7 +294,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
 	var (
 		images []*jdshopapi.CreateSkuParamImages
-		desc   string
+		// desc   string
 	)
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
 		Title:         storeSku.Name,
@@ -312,9 +312,9 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style="width: auto; height: auto; max-width: 100%;">`
-	createSkuParamWare.MobileDesc = desc
-	createSkuParamWare.Introduction = desc
+	// desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style="width: auto; height: auto; max-width: 100%;">`
+	createSkuParamWare.MobileDesc = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
+	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
 	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)

From 09c866c189259ea91218027ba862605113792d92 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, 13 May 2020 16:32:40 +0800
Subject: [PATCH 056/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  2 +-
 business/jxstore/tempop/tempop.go             | 22 ++++++++++
 business/jxutils/datares/datares.go           |  6 +++
 business/model/common.go                      |  1 +
 business/partner/purchase/jdshop/jds.go       | 12 +++++-
 business/partner/purchase/jdshop/store_sku.go | 42 +++++++++----------
 controllers/temp_op.go                        | 13 ++++++
 routers/commentsRouter_controllers.go         |  9 ++++
 8 files changed, 84 insertions(+), 23 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 9b92458ed..6a12e03b9 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -336,7 +336,7 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// }()
 		if vendorID == model.VendorIDJDShop {
 			for _, v := range storeSkuList {
-				updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
+				updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
 				for k, vv := range v.StoreSkuSyncInfoJds {
 					updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
 					err = updateJdsWareID(db, vv)
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 48623eb26..cfe9c0165 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils/datares"
+
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1496,3 +1498,23 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 	// return "456", err
 	return api.JdAPI.AddSku(outSkuId, cagtegoryId, shopCategories, brandId, skuName, skuPrice, weight, images, fixedStatus, isSale, addParams)
 }
+
+func UploadJdsImage(ctx *jxcontext.Context) (err error) {
+	var skuNames []*model.SkuName
+	sql := `
+	 	SELECT DISTINCT a.* 
+	 	FROM sku_name a, store_sku_bind b, sku c
+	 	WHERE a.id = c.name_id AND c.id = b.sku_id
+	 	AND a.deleted_at = ? AND a.status = 1 AND a.img <> ''
+	 	AND c.deleted_at = ? AND b.deleted_at = ?
+	 	AND b.store_id = ?
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
+	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
+	for _, v := range skuNames {
+		datares.TryRegisterDataResource(ctx, v.Name, v.Img, model.ImgTypeMain, false)
+		datares.TryRegisterDataResource(ctx, v.Name, v.Img2, model.ImgTypeMain, false)
+		datares.TryRegisterDataResource(ctx, v.Name, v.DescImg, model.ImgTypeMain, false)
+	}
+	return err
+}
diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go
index 267ad6da7..31fdc9baf 100644
--- a/business/jxutils/datares/datares.go
+++ b/business/jxutils/datares/datares.go
@@ -159,6 +159,9 @@ func UploadImage2Vendors(ctx *jxcontext.Context, parentTask tasksch.ITask, dataR
 	if dataRes.MtwmURL == "" {
 		vendorIDs = append(vendorIDs, model.VendorIDMTWM)
 	}
+	if dataRes.JdsURL == "" {
+		vendorIDs = append(vendorIDs, model.VendorIDJDShop)
+	}
 	if len(vendorIDs) > 0 {
 		imgName := jxutils.GetShortNameFromURL(dataRes.MainURL)
 		task := tasksch.NewSeqTask(fmt.Sprintf("上传图片至平台1:%s,%s", dataRes.Name, dataRes.MainURL), ctx,
@@ -205,6 +208,9 @@ func UploadImage2Vendors(ctx *jxcontext.Context, parentTask tasksch.ITask, dataR
 							} else if vendorID == model.VendorIDMTWM {
 								dataRes.MtwmURL = imgHint
 								updateField = "MtwmURL"
+							} else if vendorID == model.VendorIDJDShop {
+								dataRes.JdsURL = imgHint
+								updateField = "JdsURL"
 							}
 							dao.UpdateEntity(db, dataRes, updateField)
 						}
diff --git a/business/model/common.go b/business/model/common.go
index e5c3a1d10..01a450373 100644
--- a/business/model/common.go
+++ b/business/model/common.go
@@ -33,6 +33,7 @@ type DataResource struct {
 	QiniuURL string `orm:"size(512);column(qiniu_url);index" json:"qiniuURL"`
 	EbaiURL  string `orm:"size(512);column(ebai_url);index" json:"ebaiURL"`
 	MtwmURL  string `orm:"size(512);column(mtwm_url);index" json:"mtwmURL"`
+	JdsURL   string `orm:"size(512);column(jds_url);index" json:"jdsURL"`
 
 	Remark string `orm:"size(1024)" json:"remark"`
 }
diff --git a/business/partner/purchase/jdshop/jds.go b/business/partner/purchase/jdshop/jds.go
index 8e77d688f..8f73f40d4 100644
--- a/business/partner/purchase/jdshop/jds.go
+++ b/business/partner/purchase/jdshop/jds.go
@@ -6,6 +6,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/business/partner/putils"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -36,7 +37,16 @@ func (p *PurchaseHandler) GetVendorID() int {
 }
 
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, vendorOrgCode, imgURL string, imgData []byte, imgName string, imgType int) (imgHint string, err error) {
-
+	if globals.EnableJdShopWrite {
+		if imgType > model.ImgTypeLocal {
+			result, err := api.JdShopAPI.UploadPicture(imgData, 0, imgName)
+			if err == nil {
+				imgHint = result.PictureURL
+			}
+		}
+	} else {
+		imgHint = utils.GetUpperUUID()
+	}
 	return imgHint, err
 }
 
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index e661824d5..6b6449c88 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,7 +2,6 @@ package jdshop
 
 import (
 	"regexp"
-	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -317,35 +316,36 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
-	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
-	if err != nil {
-		return createSkuParamWare, createSkuParamSkus, err
-	}
-	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-	if err != nil {
-		return createSkuParamWare, createSkuParamSkus, err
-	}
+	// data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
+	// if err != nil {
+	// 	return createSkuParamWare, createSkuParamSkus, err
+	// }
+	// uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+	// if err != nil {
+	// 	return createSkuParamWare, createSkuParamSkus, err
+	// }
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
-		ImgURL:   uploadResult.PictureURL,
+		ImgURL:   storeSku.Img,
 	}
 	img2 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 2,
 	}
 	if storeSku.Img2 == "" {
-		img2.ImgURL = uploadResult.PictureURL
-	} else {
-		data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
-		if err != nil {
-			return createSkuParamWare, createSkuParamSkus, err
-		}
-		uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-		if err != nil {
-			return createSkuParamWare, createSkuParamSkus, err
-		}
-		img2.ImgURL = uploadResult2.PictureURL
+		img2.ImgURL = storeSku.Img
+		// 	img2.ImgURL = uploadResult.PictureURL
+		// } else {
+		// 	data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
+		// 	if err != nil {
+		// 		return createSkuParamWare, createSkuParamSkus, err
+		// 	}
+		// 	uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+		// 	if err != nil {
+		// 		return createSkuParamWare, createSkuParamSkus, err
+		// 	}
+		// 	img2.ImgURL = uploadResult2.PictureURL
 	}
 	images = append(images, img1)
 	images = append(images, img2)
diff --git a/controllers/temp_op.go b/controllers/temp_op.go
index b2ab93b95..82c9ba8ef 100644
--- a/controllers/temp_op.go
+++ b/controllers/temp_op.go
@@ -368,3 +368,16 @@ func (c *TempOpController) BuildSkuFromEbaiStore() {
 		return retVal, "", err
 	})
 }
+
+// @Title 上传京东商城图片
+// @Description 上传京东商城图片
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UploadJdsImage [post]
+func (c *TempOpController) UploadJdsImage() {
+	c.callUploadJdsImage(func(params *tTempopUploadJdsImageParams) (retVal interface{}, errCode string, err error) {
+		err = tempop.UploadJdsImage(params.Ctx)
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index b7349c580..69e4aa67d 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -2448,6 +2448,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TempOpController"],
+        beego.ControllerComments{
+            Method: "UploadJdsImage",
+            Router: `/UploadJdsImage`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:User2Controller"],
         beego.ControllerComments{
             Method: "AddMyDeliveryAddress",

From 0383c172418c3c9481d829b71a814c9c40582c71 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, 13 May 2020 16:34:23 +0800
Subject: [PATCH 057/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 6b6449c88..40c290569 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,6 +2,7 @@ package jdshop
 
 import (
 	"regexp"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -316,14 +317,14 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
-	// data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
-	// uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
+	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+	if err != nil {
+		return createSkuParamWare, createSkuParamSkus, err
+	}
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
@@ -334,18 +335,18 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		ImgIndex: 2,
 	}
 	if storeSku.Img2 == "" {
-		img2.ImgURL = storeSku.Img
-		// 	img2.ImgURL = uploadResult.PictureURL
-		// } else {
-		// 	data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	img2.ImgURL = uploadResult2.PictureURL
+		// img2.ImgURL = storeSku.Img
+		img2.ImgURL = uploadResult.PictureURL
+	} else {
+		data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
+		}
+		uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+		if err != nil {
+			return createSkuParamWare, createSkuParamSkus, err
+		}
+		img2.ImgURL = uploadResult2.PictureURL
 	}
 	images = append(images, img1)
 	images = append(images, img2)

From 3d260890eeb97bc823391c89a1ce853b7eccd2e3 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, 13 May 2020 16:41:10 +0800
Subject: [PATCH 058/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 40c290569..1c06de74e 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -328,7 +328,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
-		ImgURL:   storeSku.Img,
+		ImgURL:   uploadResult.PictureURL,
 	}
 	img2 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",

From 02d0fcc253086b6e8b9f580cf337965869a90fb3 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, 13 May 2020 16:57:26 +0800
Subject: [PATCH 059/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 1c06de74e..059370963 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"time"
 
@@ -37,20 +38,27 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 				return failedList, err
 			}
-			v.JdsWareID = createSkuResult.WareID
-			for _, vv2 := range v.StoreSkuSyncInfoJds {
-				for _, vv := range createSkuParamSkus {
-					for _, vvv := range vv.SaleAttrs {
-						for _, vv1 := range createSkuResult.Skus {
-							for _, vvv1 := range vv1.SaleAttrs {
-								if vvv1.AttrValues[0] == vvv.AttrValues[0] {
-									vv2.VendorSkuID = utils.Int64ToStr(vv1.SkuID)
-								}
-							}
-						}
+			var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
+			var resultAttrs = make(map[string]int64)
+			for _, vv := range createSkuParamSkus {
+				for _, vvv := range vv.SaleAttrs {
+					paramAttrs[vvv.AttrValues[0]] = vv
+				}
+			}
+			for _, vv1 := range createSkuResult.Skus {
+				for _, vvv1 := range vv1.SaleAttrs {
+					if paramAttrs[vvv1.AttrValues[0]] != nil {
+						resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
 					}
 				}
 			}
+			fmt.Println("test11111111111111111111111111", utils.Format4Output(resultAttrs, false))
+			for _, vv2 := range v.StoreSkuSyncInfoJds {
+				vv2.JdsWareID = createSkuResult.WareID
+				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
+					vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+				}
+			}
 		}
 	}
 	return failedList, err

From 6e402021cfb471476898219a6e0169213b03bb1b 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, 13 May 2020 18:06:24 +0800
Subject: [PATCH 060/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 059370963..fdb033960 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"time"
 
@@ -52,7 +51,6 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					}
 				}
 			}
-			fmt.Println("test11111111111111111111111111", utils.Format4Output(resultAttrs, false))
 			for _, vv2 := range v.StoreSkuSyncInfoJds {
 				vv2.JdsWareID = createSkuResult.WareID
 				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
@@ -408,7 +406,6 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	}
 	features = append(features, feature)
 	createSkuParamWare.Features = features
-
 	//组合sku
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var (

From a25a23520a8809cba1ea10f03314e56063f20c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 08:52:30 +0800
Subject: [PATCH 061/285] =?UTF-8?q?ordersku=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/order.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/model/order.go b/business/model/order.go
index 175171a9f..888555a36 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -154,6 +154,7 @@ type OrderSku struct {
 	SkuType        int       `json:"skuType"`                      // 当前如果为gift就为1，否则缺省为0
 	PromotionType  int       `json:"promotionType"`                // todo 当前是用于记录京东的PromotionType(生成jxorder用)，没有做转换
 	OrderCreatedAt time.Time `orm:"type(datetime);index" json:"-"` // 分区考虑
+	IsVendorAct    bool      `json:"-"`                            //用于区分是否在平台上有活动，且需要按新规则填结算价
 }
 
 // 同样商品在一个订单中可能重复出现（比如搞活动时，相同商品价格不一样，第一个有优惠）

From e36ca7fee4d7ef0a4e27a3f72c8e4878c2231848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 08:55:22 +0800
Subject: [PATCH 062/285] =?UTF-8?q?ordersku=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/order.go b/business/model/order.go
index 888555a36..78a4f508e 100644
--- a/business/model/order.go
+++ b/business/model/order.go
@@ -154,7 +154,7 @@ type OrderSku struct {
 	SkuType        int       `json:"skuType"`                      // 当前如果为gift就为1，否则缺省为0
 	PromotionType  int       `json:"promotionType"`                // todo 当前是用于记录京东的PromotionType(生成jxorder用)，没有做转换
 	OrderCreatedAt time.Time `orm:"type(datetime);index" json:"-"` // 分区考虑
-	IsVendorAct    bool      `json:"-"`                            //用于区分是否在平台上有活动，且需要按新规则填结算价
+	IsVendorAct    bool      `orm:"-" json:"-"`                    //用于区分是否在平台上有活动，且需要按新规则填结算价
 }
 
 // 同样商品在一个订单中可能重复出现（比如搞活动时，相同商品价格不一样，第一个有优惠）

From 1a836ef40c510fcb3084e5dc4777e3d23f1b8d2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:01:32 +0800
Subject: [PATCH 063/285] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 810e68296..88e899361 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -738,7 +738,6 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
 	task := tasksch.NewParallelTask("刷新历史订单结算价", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			order := batchItemList[0].(*model.GoodsOrder)
-			fmt.Println("test333333333333333333333333333333", order.VendorOrderID)
 			db := dao.GetDB()
 			updateSingleOrderEarningPrice(order, db)
 			dao.Begin(db)

From ddf471eaf92bd48bf6ff9aa9e833fdc709c79d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:20:49 +0800
Subject: [PATCH 064/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index cfe9c0165..0aca7c3be 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1515,6 +1515,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 		datares.TryRegisterDataResource(ctx, v.Name, v.Img, model.ImgTypeMain, false)
 		datares.TryRegisterDataResource(ctx, v.Name, v.Img2, model.ImgTypeMain, false)
 		datares.TryRegisterDataResource(ctx, v.Name, v.DescImg, model.ImgTypeMain, false)
+		break
 	}
 	return err
 }

From 7c4c5ae0ff29d309e42294265059b4b781bfac75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:23:31 +0800
Subject: [PATCH 065/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 0aca7c3be..a6960c25b 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1512,6 +1512,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
+		fmt.Println("test1", *v)
 		datares.TryRegisterDataResource(ctx, v.Name, v.Img, model.ImgTypeMain, false)
 		datares.TryRegisterDataResource(ctx, v.Name, v.Img2, model.ImgTypeMain, false)
 		datares.TryRegisterDataResource(ctx, v.Name, v.DescImg, model.ImgTypeMain, false)

From d8716f78899a7da3231d7120c434826ef50ad6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:32:33 +0800
Subject: [PATCH 066/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index a6960c25b..556aed05a 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -1513,9 +1514,12 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
 		fmt.Println("test1", *v)
-		datares.TryRegisterDataResource(ctx, v.Name, v.Img, model.ImgTypeMain, false)
-		datares.TryRegisterDataResource(ctx, v.Name, v.Img2, model.ImgTypeMain, false)
-		datares.TryRegisterDataResource(ctx, v.Name, v.DescImg, model.ImgTypeMain, false)
+		resBinary1, hashCode1, _ := jxutils.DownloadFileByURL(v.Img)
+		resBinary2, hashCode2, _ := jxutils.DownloadFileByURL(v.Img2)
+		resBinary3, hashCode3, _ := jxutils.DownloadFileByURL(v.DescImg)
+		datares.RegisterDataResource(ctx, v.Name, v.Img, http.DetectContentType(resBinary1), hashCode1, resBinary1, model.ImgTypeMain, false)
+		datares.RegisterDataResource(ctx, v.Name, v.Img2, http.DetectContentType(resBinary2), hashCode2, resBinary2, model.ImgTypeMain, false)
+		datares.RegisterDataResource(ctx, v.Name, v.DescImg, http.DetectContentType(resBinary3), hashCode3, resBinary3, model.ImgTypeMain, false)
 		break
 	}
 	return err

From b5a8976fce62058e9ffa2609886ae5dee14701fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 10:50:50 +0800
Subject: [PATCH 067/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 43 ++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 556aed05a..7fc959200 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -9,8 +9,6 @@ import (
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/business/jxutils/datares"
-
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1501,7 +1499,10 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	var skuNames []*model.SkuName
+	var (
+		skuNames []*model.SkuName
+		db       = dao.GetDB()
+	)
 	sql := `
 	 	SELECT DISTINCT a.* 
 	 	FROM sku_name a, store_sku_bind b, sku c
@@ -1513,13 +1514,35 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
-		fmt.Println("test1", *v)
-		resBinary1, hashCode1, _ := jxutils.DownloadFileByURL(v.Img)
-		resBinary2, hashCode2, _ := jxutils.DownloadFileByURL(v.Img2)
-		resBinary3, hashCode3, _ := jxutils.DownloadFileByURL(v.DescImg)
-		datares.RegisterDataResource(ctx, v.Name, v.Img, http.DetectContentType(resBinary1), hashCode1, resBinary1, model.ImgTypeMain, false)
-		datares.RegisterDataResource(ctx, v.Name, v.Img2, http.DetectContentType(resBinary2), hashCode2, resBinary2, model.ImgTypeMain, false)
-		datares.RegisterDataResource(ctx, v.Name, v.DescImg, http.DetectContentType(resBinary3), hashCode3, resBinary3, model.ImgTypeMain, false)
+		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
+			datar := &model.DataResource{
+				MainURL: vv,
+			}
+			err = dao.GetEntity(db, datar, "MainURL")
+			resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
+			handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
+			img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
+			if dao.IsNoRowsError(err) {
+				dataRes := &model.DataResource{
+					Name:         v.Name,
+					HashCode:     hashCode,
+					ResourceType: http.DetectContentType(resBinary),
+					MainURL:      vv,
+					JdsURL:       img,
+				}
+				if vv == v.DescImg {
+					dataRes.UseType = model.ImgTypeDesc
+				} else {
+					dataRes.UseType = model.ImgTypeMain
+				}
+				dao.CreateEntity(db, dataRes)
+			} else {
+				if err == nil {
+					datar.JdsURL = img
+					dao.UpdateEntity(db, datar, "JdsURL")
+				}
+			}
+		}
 		break
 	}
 	return err

From a2813ab3dbd5f10ba676b929a6a0a184f8a9bf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:38:01 +0800
Subject: [PATCH 068/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 52 +++++++++++++++++--------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 7fc959200..533eac2d1 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1515,35 +1515,41 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
 		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
-			datar := &model.DataResource{
-				MainURL: vv,
+			if vv == "" {
+				continue
 			}
-			err = dao.GetEntity(db, datar, "MainURL")
-			resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
-			handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
-			img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
-			if dao.IsNoRowsError(err) {
-				dataRes := &model.DataResource{
-					Name:         v.Name,
-					HashCode:     hashCode,
-					ResourceType: http.DetectContentType(resBinary),
-					MainURL:      vv,
-					JdsURL:       img,
+			if v.ID == 9619 {
+
+				datar := &model.DataResource{
+					MainURL: vv,
 				}
-				if vv == v.DescImg {
-					dataRes.UseType = model.ImgTypeDesc
+				err = dao.GetEntity(db, datar, "MainURL")
+				resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
+				handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
+				img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
+				if dao.IsNoRowsError(err) {
+					dataRes := &model.DataResource{
+						HashCode:     hashCode,
+						ResourceType: http.DetectContentType(resBinary),
+						MainURL:      vv,
+						JdsURL:       img,
+					}
+					if vv == v.DescImg {
+						dataRes.Name = v.Name + "_desc"
+						dataRes.UseType = model.ImgTypeDesc
+					} else {
+						dataRes.UseType = model.ImgTypeMain
+						dataRes.Name = v.Name
+					}
+					dao.CreateEntity(db, dataRes)
 				} else {
-					dataRes.UseType = model.ImgTypeMain
-				}
-				dao.CreateEntity(db, dataRes)
-			} else {
-				if err == nil {
-					datar.JdsURL = img
-					dao.UpdateEntity(db, datar, "JdsURL")
+					if err == nil {
+						datar.JdsURL = img
+						dao.UpdateEntity(db, datar, "JdsURL")
+					}
 				}
 			}
 		}
-		break
 	}
 	return err
 }

From c306af35bb109f31efe94546b489df8061ff9272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:40:34 +0800
Subject: [PATCH 069/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 533eac2d1..dcbdcc1a9 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1514,12 +1514,11 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
-		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
-			if vv == "" {
-				continue
-			}
-			if v.ID == 9619 {
-
+		if v.ID == 9619 {
+			for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
+				if vv == "" {
+					continue
+				}
 				datar := &model.DataResource{
 					MainURL: vv,
 				}

From 44fd5977d9f6c602117bf38ef9d179d83b2377e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:42:27 +0800
Subject: [PATCH 070/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index dcbdcc1a9..2781d4c35 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1514,7 +1514,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
 	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
 	for _, v := range skuNames {
-		if v.ID == 9619 {
+		if v.ID == 9169 {
 			for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
 				if vv == "" {
 					continue

From a51634b8cffe14a496e373d26dba3d75584bb2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:43:32 +0800
Subject: [PATCH 071/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 2781d4c35..dafa3f254 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1519,6 +1519,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 				if vv == "" {
 					continue
 				}
+
 				datar := &model.DataResource{
 					MainURL: vv,
 				}

From 2b03cb51d972d9ffe197f27da7fe884f4b3e5085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:46:13 +0800
Subject: [PATCH 072/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 43 +++++++++----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fdb033960..77e3791e9 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,7 +2,6 @@ package jdshop
 
 import (
 	"regexp"
-	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -323,36 +322,36 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
 	//上传京东图片 start
 	//规则，有两张就传两张，没有就重复传一张
-	data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
-	if err != nil {
-		return createSkuParamWare, createSkuParamSkus, err
-	}
-	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-	if err != nil {
-		return createSkuParamWare, createSkuParamSkus, err
-	}
+	// data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
+	// if err != nil {
+	// 	return createSkuParamWare, createSkuParamSkus, err
+	// }
+	// uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+	// if err != nil {
+	// 	return createSkuParamWare, createSkuParamSkus, err
+	// }
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
-		ImgURL:   uploadResult.PictureURL,
+		ImgURL:   storeSku.Img,
 	}
 	img2 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 2,
 	}
 	if storeSku.Img2 == "" {
-		// img2.ImgURL = storeSku.Img
-		img2.ImgURL = uploadResult.PictureURL
-	} else {
-		data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
-		if err != nil {
-			return createSkuParamWare, createSkuParamSkus, err
-		}
-		uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-		if err != nil {
-			return createSkuParamWare, createSkuParamSkus, err
-		}
-		img2.ImgURL = uploadResult2.PictureURL
+		img2.ImgURL = storeSku.Img
+		// 	img2.ImgURL = uploadResult.PictureURL
+		// } else {
+		// 	data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
+		// 	if err != nil {
+		// 		return createSkuParamWare, createSkuParamSkus, err
+		// 	}
+		// 	uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
+		// 	if err != nil {
+		// 		return createSkuParamWare, createSkuParamSkus, err
+		// 	}
+		// 	img2.ImgURL = uploadResult2.PictureURL
 	}
 	images = append(images, img1)
 	images = append(images, img2)

From 3e1dd28511dcd58e984ad07540458a37089f9e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 11:49:01 +0800
Subject: [PATCH 073/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=90=8E=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 57bbcdc65..dd3161782 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -21,8 +21,9 @@ type StoreSkuAndAct struct {
 
 var (
 	dataResFieldMap = map[int]string{
-		model.VendorIDMTWM: "mtwm_url",
-		model.VendorIDEBAI: "ebai_url",
+		model.VendorIDMTWM:   "mtwm_url",
+		model.VendorIDEBAI:   "ebai_url",
+		model.VendorIDJDShop: "jds_url",
 	}
 	salePriceLimit = 100
 )

From c2ba5b28c940433cea279a01ea5db17ee0e7d16b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:08:32 +0800
Subject: [PATCH 074/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81over=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 59 +++++++++++--------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 77e3791e9..ef4f5b482 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -317,46 +317,41 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		JdPrice:       int(storeSku.UnitPrice) / 100,
 		MarketPrice:   int(storeSku.UnitPrice) / 100,
 	}
-	// desc = `<img src="` + jdshopapi.JdsImgURL + "jfs/t1/123931/34/1429/184963/5ebb9b63E45411990/f2030df3fab57928.jpg" + `" style="width: auto; height: auto; max-width: 100%;">`
-	createSkuParamWare.MobileDesc = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
-	createSkuParamWare.Introduction = "因生鲜比较脆弱，发货途中如果有磕碰损坏，请收到联系客服，闪电赔付。请核对好地址，发货后不可修改地址，因改地址导致损坏不能赔付，谢谢理解"
-	//上传京东图片 start
+
+	//上传京东图片
 	//规则，有两张就传两张，没有就重复传一张
-	// data, _, err := jxutils.DownloadFileByURL(storeSku.Img)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
-	// uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-	// if err != nil {
-	// 	return createSkuParamWare, createSkuParamSkus, err
-	// }
+	pic1, err := uploadImg(storeSku.Img, storeSku.Name, "1")
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
-		ImgURL:   storeSku.Img,
+		ImgURL:   pic1,
 	}
 	img2 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 2,
 	}
 	if storeSku.Img2 == "" {
-		img2.ImgURL = storeSku.Img
-		// 	img2.ImgURL = uploadResult.PictureURL
-		// } else {
-		// 	data2, _, err := jxutils.DownloadFileByURL(storeSku.Img2)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	uploadResult2, err := api.JdShopAPI.UploadPicture(data2, 0, utils.Int64ToStr(time.Now().Unix())+storeSku.Name)
-		// 	if err != nil {
-		// 		return createSkuParamWare, createSkuParamSkus, err
-		// 	}
-		// 	img2.ImgURL = uploadResult2.PictureURL
+		img2.ImgURL = pic1
+	} else {
+		pic2, err2 := uploadImg(storeSku.Img, storeSku.Name, "2")
+		err = err2
+		img2.ImgURL = pic2
 	}
 	images = append(images, img1)
 	images = append(images, img2)
 	createSkuParamWare.Images = images
-	//end
+
+	//商品详情拼接
+	var desc string
+	if storeSku.DescImg != "" {
+		pic3, err2 := uploadImg(storeSku.DescImg, storeSku.Name, "desc")
+		err = err2
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `<img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+	} else {
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+	}
+	createSkuParamWare.MobileDesc = desc
+	createSkuParamWare.Introduction = desc
 
 	//设置商品属性值
 	var (
@@ -440,3 +435,15 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	}
 	return createSkuParamWare, createSkuParamSkus, err
 }
+
+func uploadImg(img, name, index string) (imgURL string, err error) {
+	data, _, err := jxutils.DownloadFileByURL(img)
+	if err != nil {
+		return imgURL, err
+	}
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, name+index)
+	if err != nil {
+		return imgURL, err
+	}
+	return uploadResult.PictureURL, err
+}

From cbe68135ad21fc6dde72c4d2a0aac27ff37218d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:20:46 +0800
Subject: [PATCH 075/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81over=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go               |  2 +
 business/partner/purchase/jdshop/store_sku.go | 62 +++++++++----------
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index dd3161782..02fe77f82 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -501,6 +501,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)
+	fmt.Println(sql)
+	fmt.Println(sqlParams)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ef4f5b482..cc4bfcdd9 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -26,36 +26,36 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
-			if err != nil {
-				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-				return failedList, err
-			}
-			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
-			if err != nil {
-				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-				return failedList, err
-			}
-			var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
-			var resultAttrs = make(map[string]int64)
-			for _, vv := range createSkuParamSkus {
-				for _, vvv := range vv.SaleAttrs {
-					paramAttrs[vvv.AttrValues[0]] = vv
-				}
-			}
-			for _, vv1 := range createSkuResult.Skus {
-				for _, vvv1 := range vv1.SaleAttrs {
-					if paramAttrs[vvv1.AttrValues[0]] != nil {
-						resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
-					}
-				}
-			}
-			for _, vv2 := range v.StoreSkuSyncInfoJds {
-				vv2.JdsWareID = createSkuResult.WareID
-				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
-					vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
-				}
-			}
+			_, _, err := buildCreateWareParam(v)
+			// if err != nil {
+			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			// 	return failedList, err
+			// }
+			// createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+			// if err != nil {
+			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+			// 	return failedList, err
+			// }
+			// var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
+			// var resultAttrs = make(map[string]int64)
+			// for _, vv := range createSkuParamSkus {
+			// 	for _, vvv := range vv.SaleAttrs {
+			// 		paramAttrs[vvv.AttrValues[0]] = vv
+			// 	}
+			// }
+			// for _, vv1 := range createSkuResult.Skus {
+			// 	for _, vvv1 := range vv1.SaleAttrs {
+			// 		if paramAttrs[vvv1.AttrValues[0]] != nil {
+			// 			resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
+			// 		}
+			// 	}
+			// }
+			// for _, vv2 := range v.StoreSkuSyncInfoJds {
+			// 	vv2.JdsWareID = createSkuResult.WareID
+			// 	if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
+			// 		vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+			// 	}
+			// }
 		}
 	}
 	return failedList, err
@@ -348,7 +348,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		err = err2
 		desc = `<p>` + jdshopapi.JdsImgDescURL + `<img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
 	} else {
-		desc = `<p>` + jdshopapi.JdsImgDescURL + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+		desc = `<p>` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
 	}
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc

From a257a0b9aabb056629bfebc2350cd88e370d1084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:23:16 +0800
Subject: [PATCH 076/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81over=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index cc4bfcdd9..894760b3b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -26,7 +26,7 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			_, _, err := buildCreateWareParam(v)
+			_, _, err = buildCreateWareParam(v)
 			// if err != nil {
 			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 			// 	return failedList, err

From 4c43cf59f772d416e6c48b7d52eb5936859b8776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:25:11 +0800
Subject: [PATCH 077/285] =?UTF-8?q?=E7=AA=81=E7=84=B6=E6=83=B3=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  1 +
 business/model/dao/store_sku.go               |  2 -
 business/partner/purchase/jdshop/store_sku.go | 60 +++++++++----------
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 6a12e03b9..a547120ba 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1378,6 +1378,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.UnitPrice = v[0].UnitPrice
 		storeSku.Img = v[0].Img
 		storeSku.Img2 = v[0].Img2
+		storeSku.DescImg = v[0].DescImg
 		rList = append(rList, storeSku)
 	}
 	return rList
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 02fe77f82..dd3161782 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -501,8 +501,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 894760b3b..fc9dd7e54 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -26,36 +26,36 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			_, _, err = buildCreateWareParam(v)
-			// if err != nil {
-			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-			// 	return failedList, err
-			// }
-			// createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
-			// if err != nil {
-			// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-			// 	return failedList, err
-			// }
-			// var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
-			// var resultAttrs = make(map[string]int64)
-			// for _, vv := range createSkuParamSkus {
-			// 	for _, vvv := range vv.SaleAttrs {
-			// 		paramAttrs[vvv.AttrValues[0]] = vv
-			// 	}
-			// }
-			// for _, vv1 := range createSkuResult.Skus {
-			// 	for _, vvv1 := range vv1.SaleAttrs {
-			// 		if paramAttrs[vvv1.AttrValues[0]] != nil {
-			// 			resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
-			// 		}
-			// 	}
-			// }
-			// for _, vv2 := range v.StoreSkuSyncInfoJds {
-			// 	vv2.JdsWareID = createSkuResult.WareID
-			// 	if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
-			// 		vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
-			// 	}
-			// }
+			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
+			if err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+				return failedList, err
+			}
+			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+			if err != nil {
+				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+				return failedList, err
+			}
+			var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
+			var resultAttrs = make(map[string]int64)
+			for _, vv := range createSkuParamSkus {
+				for _, vvv := range vv.SaleAttrs {
+					paramAttrs[vvv.AttrValues[0]] = vv
+				}
+			}
+			for _, vv1 := range createSkuResult.Skus {
+				for _, vvv1 := range vv1.SaleAttrs {
+					if paramAttrs[vvv1.AttrValues[0]] != nil {
+						resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
+					}
+				}
+			}
+			for _, vv2 := range v.StoreSkuSyncInfoJds {
+				vv2.JdsWareID = createSkuResult.WareID
+				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
+					vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+				}
+			}
 		}
 	}
 	return failedList, err

From f819162ca01cc9bfaa2777fcfe81319a8fb0afc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 14:29:59 +0800
Subject: [PATCH 078/285] =?UTF-8?q?=E7=AA=81=E7=84=B6=E6=83=B3=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fc9dd7e54..807119b49 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -346,7 +346,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	if storeSku.DescImg != "" {
 		pic3, err2 := uploadImg(storeSku.DescImg, storeSku.Name, "desc")
 		err = err2
-		desc = `<p>` + jdshopapi.JdsImgDescURL + `<img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+		desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;">` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
 	} else {
 		desc = `<p>` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
 	}

From 67162dac8241820069e93f1cb16dc596ad850eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 15:00:05 +0800
Subject: [PATCH 079/285] =?UTF-8?q?=E7=B4=A2=E5=BC=95=E5=8E=BB=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/store_sku.go b/business/model/store_sku.go
index 239eda7a5..89e0fb996 100644
--- a/business/model/store_sku.go
+++ b/business/model/store_sku.go
@@ -102,7 +102,7 @@ type StoreSkuBind struct {
 	EbaiID    int64 `orm:"column(ebai_id);index"`
 	YbID      int64 `orm:"column(yb_id);index"`
 	JdsID     int64 `orm:"column(jds_id);index"`
-	JdsWareID int64 `orm:"column(jds_ware_id);index"`
+	JdsWareID int64 `orm:"column(jds_ware_id)"`
 	// WscID  int64 `orm:"column(wsc_id);index"`  // 表示微盟skuId
 	// WscID2 int64 `orm:"column(wsc_id2);index"` // 表示微盟goodsId
 

From 003b01b124c280f1b6f766ecb4efaa3907e0a0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 15:03:42 +0800
Subject: [PATCH 080/285] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/conf/app.conf b/conf/app.conf
index 31be0143c..2fa3e9fc4 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -181,6 +181,10 @@ jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
+jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
+jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
+jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+
 elmIsProd = true
 elmToken  = ""
 elmAppKey = "KLRDcOZGrk"
@@ -221,6 +225,7 @@ enableEbaiStoreWrite = true
 enableMtwmStoreWrite = true
 enableWscStoreWrite = true
 enableYbStoreWrite = true 
+enableJdShopWrite = true
 
 disableWeimob = false
 weimobCallbackURL = "http://callback.jxc4.com/weimob"

From dfcd2593b7491907d16b422c16c68fea314f6e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 16:05:51 +0800
Subject: [PATCH 081/285] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 807119b49..0a9522eb3 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -2,6 +2,7 @@ package jdshop
 
 import (
 	"regexp"
+	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -301,8 +302,9 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		images []*jdshopapi.CreateSkuParamImages
 		// desc   string
 	)
+	name := filterSensitiveWord(storeSku.Name)
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
-		Title:         storeSku.Name,
+		Title:         name,
 		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
@@ -447,3 +449,12 @@ func uploadImg(img, name, index string) (imgURL string, err error) {
 	}
 	return uploadResult.PictureURL, err
 }
+
+func filterSensitiveWord(name string) (result string) {
+	for _, v := range jdshopapi.SensitiveWordMap {
+		if strings.Contains(name, v) {
+			return strings.ReplaceAll(name, v, "")
+		}
+	}
+	return name
+}

From 6eb85cb9aa0125cf081f9f4118e5c41dedaaef10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 16:16:51 +0800
Subject: [PATCH 082/285] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E5=92=8C?=
 =?UTF-8?q?=E9=9D=9E=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index a547120ba..45ad01e7c 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -335,11 +335,19 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// 	}
 		// }()
 		if vendorID == model.VendorIDJDShop {
-			for _, v := range storeSkuList {
-				updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
-				for k, vv := range v.StoreSkuSyncInfoJds {
-					updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
-					err = updateJdsWareID(db, vv)
+			if syncStatus == model.SyncFlagNewMask {
+				for _, v := range storeSkuList {
+					updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
+					for k, vv := range v.StoreSkuSyncInfoJds {
+						updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
+						err = updateJdsWareID(db, vv)
+					}
+					num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
+				}
+			} else {
+				updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
+				for k, v := range storeSkuList {
+					updateItemList[k] = sku2Update(vendorID, v, syncStatus)
 				}
 				num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
 			}

From 946aad298d4f24c89a44fc73334bff15beae128d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 16:32:11 +0800
Subject: [PATCH 083/285] =?UTF-8?q?=E6=95=8F=E6=84=9F=E8=AF=8D=E5=92=8C?=
 =?UTF-8?q?=E9=9D=9E=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 0a9522eb3..ec3eb8eac 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -315,9 +315,9 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		Length:        100,
 		Width:         100,
 		Height:        100,
-		Weight:        500,
-		JdPrice:       int(storeSku.UnitPrice) / 100,
-		MarketPrice:   int(storeSku.UnitPrice) / 100,
+		Weight:        0.5,
+		JdPrice:       jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		MarketPrice:   jxutils.IntPrice2Standard(storeSku.UnitPrice),
 	}
 
 	//上传京东图片
@@ -425,7 +425,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsPropSku = append(attrsPropSku, attrSku)
 		sku := &jdshopapi.CreateSkuParamSkus{
-			JdPrice:  int(v.VendorPrice) / 100,
+			JdPrice:  jxutils.IntPrice2Standard(v.VendorPrice),
 			StockNum: 9999,
 			Type:     "com.jd.pop.ware.ic.api.domain.sku",
 			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",

From 5b95a414acaa450772716a4743866ad83d19ee87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 17:00:40 +0800
Subject: [PATCH 084/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ec3eb8eac..f0a2e55f2 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -82,7 +82,10 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+			err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
+			if err == nil {
+				err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+			}
 		}
 		if err != nil {
 			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
@@ -308,16 +311,16 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
-		TransportID:   jdshopapi.TransportID,
-		WareStatus:    8, //上架待审核
-		OuterID:       utils.Int2Str(storeSku.NameID),
-		VenderID:      0,
-		Length:        100,
-		Width:         100,
-		Height:        100,
-		Weight:        0.5,
-		JdPrice:       jxutils.IntPrice2Standard(storeSku.UnitPrice),
-		MarketPrice:   jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		// TransportID:   jdshopapi.TransportID,
+		WareStatus:  8, //上架待审核
+		OuterID:     utils.Int2Str(storeSku.NameID),
+		VenderID:    0,
+		Length:      100,
+		Width:       100,
+		Height:      100,
+		Weight:      0.5,
+		JdPrice:     jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
 	}
 
 	//上传京东图片

From ffbc6e49bd4140f725850f3cde1b2a9e0f74a6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 17:08:13 +0800
Subject: [PATCH 085/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index f0a2e55f2..0f68ddc79 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -351,9 +351,9 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	if storeSku.DescImg != "" {
 		pic3, err2 := uploadImg(storeSku.DescImg, storeSku.Name, "desc")
 		err = err2
-		desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;">` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
+		desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
 	} else {
-		desc = `<p>` + jdshopapi.JdsImgDescURL + `<br></p><p><br></p>`
+		desc = `<p><br></p><p><br></p>`
 	}
 	createSkuParamWare.MobileDesc = desc
 	createSkuParamWare.Introduction = desc

From 212f387217902aed0bec2c9f3850c27f38792ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 17:27:19 +0800
Subject: [PATCH 086/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E4=BB=B7=E5=92=8C?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=BB=B7=E5=85=88=E5=B9=B3=E4=BA=86=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 0f68ddc79..fca432b97 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -312,15 +312,15 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
 		// TransportID:   jdshopapi.TransportID,
-		WareStatus:  8, //上架待审核
-		OuterID:     utils.Int2Str(storeSku.NameID),
-		VenderID:    0,
-		Length:      100,
-		Width:       100,
-		Height:      100,
-		Weight:      0.5,
-		JdPrice:     jxutils.IntPrice2Standard(storeSku.UnitPrice),
-		MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		WareStatus: 8, //上架待审核
+		OuterID:    utils.Int2Str(storeSku.NameID),
+		VenderID:   0,
+		Length:     100,
+		Width:      100,
+		Height:     100,
+		Weight:     0.5,
+		// JdPrice:     jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		// MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
 	}
 
 	//上传京东图片

From bef98b513880e86e3498a512c11cf6e69cc8a02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 14 May 2020 17:34:30 +0800
Subject: [PATCH 087/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E4=BB=B7=E5=92=8C?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=BB=B7=E5=85=88=E5=B9=B3=E4=BA=86=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fca432b97..f28e3e461 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -319,7 +319,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		Width:      100,
 		Height:     100,
 		Weight:     0.5,
-		// JdPrice:     jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		JdPrice:    jxutils.IntPrice2Standard(storeSku.UnitPrice),
 		// MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
 	}
 
@@ -406,6 +406,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	features = append(features, feature)
 	createSkuParamWare.Features = features
 	//组合sku
+	var vendorPrice int64 = 0
 	for _, v := range storeSku.StoreSkuSyncInfoJds {
 		var (
 			ggValueID    int64 //规格的属性id
@@ -434,10 +435,14 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",
 			OuterID:  utils.Int2Str(v.SkuID),
 		}
-
 		sku.SaleAttrs = attrsPropSku
 		createSkuParamSkus = append(createSkuParamSkus, sku)
+
+		if v.VendorPrice > vendorPrice {
+			vendorPrice = v.VendorPrice
+		}
 	}
+	createSkuParamWare.MarketPrice = jxutils.IntPrice2Standard(vendorPrice)
 	return createSkuParamWare, createSkuParamSkus, err
 }
 

From 5e5b6e8ce24e3249fed5fdb01f3e81dfaa217089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 08:57:18 +0800
Subject: [PATCH 088/285] =?UTF-8?q?getstoreskus=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             |  4 ++-
 business/partner/purchase/jdshop/store_sku.go | 33 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 4d7248c0c..d021103c2 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -537,7 +537,7 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	t2.comment, t2.category_id sku_category_id, t2.status sku_status, t2.eclp_id,
 	t4.created_at bind_created_at, t4.updated_at bind_updated_at, t4.last_operator bind_last_operator, t4.deleted_at bind_deleted_at,
 	t4.sub_store_id, t4.price bind_price, IF(t4.unit_price IS NOT NULL, t4.unit_price, t1.price) unit_price, t4.status store_sku_status, t4.auto_sale_at,
-	t4.ebai_id, t4.mtwm_id, t4.yb_id, CONCAT(smm.yb_store_prefix,t1.yb_name_suffix) yb_sku_name,
+	t4.ebai_id, t4.mtwm_id, t4.yb_id, CONCAT(smm.yb_store_prefix,t1.yb_name_suffix) yb_sku_name, t4.jds_id, t4.jds_ware_id,
 	t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status, t4.yb_sync_status, t4.jds_sync_status,
 	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price, t4.yb_price, t4.jds_price,
 	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time, t4.yb_lock_time, t4.jds_lock_time,
@@ -549,6 +549,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	}
 	var tmpList []*tGetStoresSkusInfo
 	beginTime := time.Now()
+	fmt.Println("test1", sql)
+	fmt.Println(sqlParams)
 	if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil {
 		dao.Rollback(db)
 		return nil, err
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index f28e3e461..a6469949a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -65,10 +65,21 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
+			// skuName := &model.SkuName{}
+			// skuName.ID = v.NameID
+			// db := dao.GetDB()
+			// if err = dao.GetEntity(db, skuName); err != nil {
+			// 	return failedList, err
+			// }
+			// payload := map[string]interface{}{
+			// 	"name": v.Name,
+			// }
+			// valid := dao.StrictMakeMapByStructObject(payload, skuName, ctx.GetUserName())
+			name := filterSensitiveWord(v.Name)
 			updateWareParam := &jdshopapi.UpdateWareParam{
 				WareID: v.JdsWareID,
-				Title:  v.SkuName,
-				Weight: v.Weight,
+				Title:  name,
+				// Weight: v.Weight,
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 		}
@@ -362,6 +373,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	var (
 		attrIDs     = make(map[string]int) //贮存方式,净含量,保质期IDs
 		zctjValueID int64                  //贮存条件冷藏0-4的id
+		gcjkValueID int64                  //国产，进口的id
 		attrsProp   []*jdshopapi.CreateSkuParamAttrs
 	)
 	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
@@ -374,6 +386,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			attrIDs[v.Name] = v.ID
 		} else if v.Name == "规格" {
 			attrIDs[v.Name] = v.ID
+		} else if v.Name == "国产/进口" {
+			attrIDs[v.Name] = v.ID
 		}
 	}
 	values, _, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["贮存条件"])
@@ -382,6 +396,21 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			zctjValueID = v.ID
 		}
 	}
+	if attrIDs["国产/进口"] != 0 {
+		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["国产/进口"])
+		err = err2
+		for _, v := range values2 {
+			if v.Name == "国产" {
+				gcjkValueID = v.ID
+			}
+		}
+		attrgcjk := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(attrIDs["国产/进口"]),
+			AttrValues: []string{utils.Int64ToStr(gcjkValueID)},
+		}
+		attrsProp = append(attrsProp, attrgcjk)
+	}
+
 	attrZctj := &jdshopapi.CreateSkuParamAttrs{
 		AttrID:     utils.Int2Str(attrIDs["贮存条件"]),
 		AttrValues: []string{utils.Int64ToStr(zctjValueID)},

From d727cf0d1ee3f93fb5fc4c512bc296b9ecb338f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 09:30:59 +0800
Subject: [PATCH 089/285] =?UTF-8?q?=E9=A5=BF=E7=99=BE=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E5=8D=95=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go       |  2 --
 business/partner/purchase/ebai/order.go | 14 +++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index d021103c2..7896db770 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -549,8 +549,6 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus, i
 	}
 	var tmpList []*tGetStoresSkusInfo
 	beginTime := time.Now()
-	fmt.Println("test1", sql)
-	fmt.Println(sqlParams)
 	if err = dao.GetRows(db, &tmpList, sql, sqlParams...); err != nil {
 		dao.Rollback(db)
 		return nil, err
diff --git a/business/partner/purchase/ebai/order.go b/business/partner/purchase/ebai/order.go
index 9f9b4271a..067fbeb2d 100644
--- a/business/partner/purchase/ebai/order.go
+++ b/business/partner/purchase/ebai/order.go
@@ -61,10 +61,14 @@ var (
 	}
 )
 
-func mapDeliveryType(ebaiDeliveryParty int) (deliveryType string) {
-	deliveryType = deliveryTypeMap[ebaiDeliveryParty]
-	if deliveryType == "" {
-		deliveryType = model.OrderDeliveryTypePlatform
+func mapDeliveryType(ebaiDeliveryParty int, businessType int) (deliveryType string) {
+	if businessType == ebaiapi.DeliveryBusinessTypeZT {
+		return model.OrderDeliveryTypeSelfTake
+	} else {
+		deliveryType = deliveryTypeMap[ebaiDeliveryParty]
+		if deliveryType == "" {
+			deliveryType = model.OrderDeliveryTypePlatform
+		}
 	}
 	return deliveryType
 }
@@ -226,7 +230,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		ActualPayPrice:   utils.ForceInterface2Int64(orderMap["user_fee"]),
 		BaseFreightMoney: utils.ForceInterface2Int64(orderMap["send_fee"]),
 		TotalShopMoney:   utils.ForceInterface2Int64(orderMap["shop_fee"]),
-		DeliveryType:     mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"]))),
+		DeliveryType:     mapDeliveryType(int(utils.ForceInterface2Int64(orderMap["delivery_party"])), int(utils.ForceInterface2Int64(orderMap["business_type"]))),
 
 		InvoiceTitle:   utils.Interface2String(orderMap["invoice_title"]),
 		InvoiceTaxerID: utils.Interface2String(orderMap["taxer_id"]),

From 4d6c660a03d720ceec4740ebd2ae8fd8356c8582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 09:51:10 +0800
Subject: [PATCH 090/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a6469949a..c4d8ff981 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -77,8 +77,9 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			// valid := dao.StrictMakeMapByStructObject(payload, skuName, ctx.GetUserName())
 			name := filterSensitiveWord(v.Name)
 			updateWareParam := &jdshopapi.UpdateWareParam{
-				WareID: v.JdsWareID,
-				Title:  name,
+				WareID:   v.JdsWareID,
+				Title:    name,
+				VenderID: jdshopapi.VenderID,
 				// Weight: v.Weight,
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
@@ -325,7 +326,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		// TransportID:   jdshopapi.TransportID,
 		WareStatus: 8, //上架待审核
 		OuterID:    utils.Int2Str(storeSku.NameID),
-		VenderID:   0,
+		VenderID:   jdshopapi.VenderID,
 		Length:     100,
 		Width:      100,
 		Height:     100,

From ded0ffd72e218beab14fb1642a8dc007f2f35a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:01:04 +0800
Subject: [PATCH 091/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        | 1 +
 business/partner/purchase/jdshop/store_sku.go | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 45ad01e7c..8ef55f649 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -597,6 +597,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			createList = rList
 		}
 	}
+	fmt.Println("test22222222222222222222222222", utils.Format4Output(onlineList, false))
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			step := batchItemList[0].(int)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index c4d8ff981..834958902 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -113,6 +114,7 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite {
+		fmt.Println("test111111111111111111111111111111111")
 		var stock = 0
 		for _, v := range storeSkuList {
 			if status == model.SkuStatusNormal {

From 2c65870b75724129c989142889abebc7c8443d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:17:22 +0800
Subject: [PATCH 092/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5sql=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index dd3161782..863ad6b09 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -404,14 +404,14 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id, t3.yb_name_suffix,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
+	t13.%s  desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID),
 		fieldPrefix,
 	}
 	if isSingleStorePF {

From 95a3de4436498b8fa1b94444426a03a918f71401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:25:33 +0800
Subject: [PATCH 093/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5sql=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 863ad6b09..71be096af 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -500,6 +500,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
+	fmt.Println("test3333333333333", sql)
+	fmt.Println(sqlParams)
 	// globals.SugarLogger.Debug(sql)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err

From 006cd1dee537dfd68e374355d77b0fa9c7111db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:30:50 +0800
Subject: [PATCH 094/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5sql=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 1 -
 business/model/dao/store_sku.go       | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 810e68296..88e899361 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -738,7 +738,6 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
 	task := tasksch.NewParallelTask("刷新历史订单结算价", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			order := batchItemList[0].(*model.GoodsOrder)
-			fmt.Println("test333333333333333333333333333333", order.VendorOrderID)
 			db := dao.GetDB()
 			updateSingleOrderEarningPrice(order, db)
 			dao.Begin(db)
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 71be096af..c67eacea7 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -404,14 +404,14 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	t3.id name_id, t3.prefix, t3.name, t3.unit, t3.upc, t3.status name_status, t3.ex_prefix, t3.ex_prefix_begin, t3.ex_prefix_end, t3.category_id name_category_id, t3.yb_name_suffix,
 	IF(t11.%s <> '', t11.%s, t3.img) img,
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
-	t13.%s  desc_img,
+	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
 	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		fieldPrefix,
 	}
 	if isSingleStorePF {
@@ -500,8 +500,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
-	fmt.Println("test3333333333333", sql)
-	fmt.Println(sqlParams)
 	// globals.SugarLogger.Debug(sql)
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
@@ -562,7 +560,7 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf
 		fieldPrefix, fieldPrefix, fieldPrefix,
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
-		GetDataResFieldName(vendorID),
+		GetDataResFieldName(vendorID), GetDataResFieldName(vendorID),
 		fieldPrefix)
 	// globals.SugarLogger.Debug(sql)
 	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))

From 626bb31e126b97f2e1e1a86c4f5468a29883046e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:36:27 +0800
Subject: [PATCH 095/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 8ef55f649..079e391f8 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -432,6 +432,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	now := jxutils.OperationTime2HourMinuteFormat(time.Now())
 	var failedList []*partner.StoreSkuInfoWithErr
 	for _, sku := range skus {
+		fmt.Println("test33333333333333333", utils.Format4Output(sku, false))
 		if !useVendorPriceDirectly &&
 			!isSkuLockTimeValid(sku) {
 			sku.VendorPrice = 0

From 2ac98c6fba2f4af3bb86a9b3c035b1f87d5dd9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:38:46 +0800
Subject: [PATCH 096/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 079e391f8..eb4e25afe 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -394,6 +394,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
 	}
+	fmt.Println("test33333333333333333", utils.Format4Output(skus, false))
 
 	if err != nil || len(skus) == 0 {
 		return err
@@ -432,7 +433,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	now := jxutils.OperationTime2HourMinuteFormat(time.Now())
 	var failedList []*partner.StoreSkuInfoWithErr
 	for _, sku := range skus {
-		fmt.Println("test33333333333333333", utils.Format4Output(sku, false))
 		if !useVendorPriceDirectly &&
 			!isSkuLockTimeValid(sku) {
 			sku.VendorPrice = 0

From 756e8d30b418e24704ec271f513ac76fb2068df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:47:34 +0800
Subject: [PATCH 097/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 1 +
 business/jxstore/cms/sync_store_sku.go        | 3 ---
 business/partner/purchase/jdshop/store_sku.go | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 7896db770..37941668b 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -2044,6 +2044,7 @@ func setStoreSkuBindStatus(skuBind *model.StoreSkuBind, status int8) {
 	skuBind.EbaiSyncStatus |= status
 	skuBind.MtwmSyncStatus |= status
 	skuBind.YbSyncStatus |= status
+	skuBind.JdsSyncStatus |= status
 }
 
 func checkStoreExisting(db *dao.DaoDB, storeID int) (store *model.Store, err error) {
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index eb4e25afe..2ccf2ea58 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -394,8 +394,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
 	}
-	fmt.Println("test33333333333333333", utils.Format4Output(skus, false))
-
 	if err != nil || len(skus) == 0 {
 		return err
 	}
@@ -598,7 +596,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			createList = rList
 		}
 	}
-	fmt.Println("test22222222222222222222222222", utils.Format4Output(onlineList, false))
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			step := batchItemList[0].(int)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 834958902..dd22887ef 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -114,7 +114,6 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite {
-		fmt.Println("test111111111111111111111111111111111")
 		var stock = 0
 		for _, v := range storeSkuList {
 			if status == model.SkuStatusNormal {

From cbdd69883b73fee1adfcf538d69b2d2f49f193cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:48:50 +0800
Subject: [PATCH 098/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index dd22887ef..c4d8ff981 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 

From 774aa3d58c32bd1ff28c8f0126884376bbf5b4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 10:58:11 +0800
Subject: [PATCH 099/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=90=8C=E6=AD=A5=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index c4d8ff981..3f96d187a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -134,7 +134,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			err = api.JdShopAPI.UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), utils.Float64TwoInt(jxutils.IntPrice2Standard(v.VendorPrice)))
+			err = api.JdShopAPI.UpdateSkuJdPrice(utils.Str2Int(v.VendorSkuID), jxutils.IntPrice2Standard(v.VendorPrice))
 		}
 		if err != nil {
 			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "修改商品价格")

From 39ba090f88dc805053e67186c825a8ba37d63b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 13:37:08 +0800
Subject: [PATCH 100/285] =?UTF-8?q?=E5=88=B7=E6=96=B0=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E4=BB=B7newearningprice=E4=B9=9F=E8=A6=81=E5=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 88e899361..c53a00978 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -784,7 +784,20 @@ func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context,
 				}
 			}
 			jxutils.RefreshOrderSkuRelated(order)
-			num, err := dao.UpdateEntity(db, order, "EarningPrice")
+			storeID := 0
+			if order.StoreID == 0 {
+				storeID = order.JxStoreID
+			} else {
+				storeID = order.StoreID
+			}
+			store, _ := dao.GetStoreDetail(db, storeID, order.VendorID)
+			payPercentage := store.PayPercentage
+			if payPercentage <= 50 {
+				order.NewEarningPrice = order.TotalShopMoney * int64((100 - payPercentage/2)) / 100
+			} else {
+				order.NewEarningPrice = order.EarningPrice
+			}
+			num, err := dao.UpdateEntity(db, order, "EarningPrice", "NewEarningPrice")
 			if err != nil {
 				return nil, err
 			}

From 68a7c6f81b5127adf3454c7465b35fe57e425386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 15:21:15 +0800
Subject: [PATCH 101/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9C=81=E5=B8=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 118 +++++++++++++++++-------------
 business/model/place.go           |   5 +-
 2 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index dafa3f254..bd170cf6f 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -1499,57 +1498,76 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	var (
-		skuNames []*model.SkuName
-		db       = dao.GetDB()
-	)
-	sql := `
-	 	SELECT DISTINCT a.* 
-	 	FROM sku_name a, store_sku_bind b, sku c
-	 	WHERE a.id = c.name_id AND c.id = b.sku_id
-	 	AND a.deleted_at = ? AND a.status = 1 AND a.img <> ''
-	 	AND c.deleted_at = ? AND b.deleted_at = ?
-	 	AND b.store_id = ?
-	`
-	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
-	err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
-	for _, v := range skuNames {
-		if v.ID == 9169 {
-			for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
-				if vv == "" {
-					continue
-				}
-
-				datar := &model.DataResource{
-					MainURL: vv,
-				}
-				err = dao.GetEntity(db, datar, "MainURL")
-				resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
-				handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
-				img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
-				if dao.IsNoRowsError(err) {
-					dataRes := &model.DataResource{
-						HashCode:     hashCode,
-						ResourceType: http.DetectContentType(resBinary),
-						MainURL:      vv,
-						JdsURL:       img,
-					}
-					if vv == v.DescImg {
-						dataRes.Name = v.Name + "_desc"
-						dataRes.UseType = model.ImgTypeDesc
-					} else {
-						dataRes.UseType = model.ImgTypeMain
-						dataRes.Name = v.Name
-					}
-					dao.CreateEntity(db, dataRes)
-				} else {
-					if err == nil {
-						datar.JdsURL = img
-						dao.UpdateEntity(db, datar, "JdsURL")
-					}
-				}
+	db := dao.GetDB()
+	result1, _ := api.JdShopAPI.GetProvince()
+	for _, v := range result1 {
+		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+		place1.JdsCode = v.AreaID
+		dao.UpdateEntity(db, place1, "JdsCode")
+		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+		for _, vv := range result2 {
+			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+			place2.JdsCode = vv.AreaID
+			dao.UpdateEntity(db, place2, "JdsCode")
+			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+			for _, vvv := range result3 {
+				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+				place3.JdsCode = vvv.AreaID
+				dao.UpdateEntity(db, place3, "JdsCode")
 			}
 		}
 	}
+	// var (
+	// 	skuNames []*model.SkuName
+	// 	db       = dao.GetDB()
+	// )
+	// sql := `
+	//  	SELECT DISTINCT a.*
+	//  	FROM sku_name a, store_sku_bind b, sku c
+	//  	WHERE a.id = c.name_id AND c.id = b.sku_id
+	//  	AND a.deleted_at = ? AND a.status = 1 AND a.img <> ''
+	//  	AND c.deleted_at = ? AND b.deleted_at = ?
+	//  	AND b.store_id = ?
+	// `
+	// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
+	// err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
+	// for _, v := range skuNames {
+	// 	if v.ID == 9169 {
+	// 		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
+	// 			if vv == "" {
+	// 				continue
+	// 			}
+
+	// 			datar := &model.DataResource{
+	// 				MainURL: vv,
+	// 			}
+	// 			err = dao.GetEntity(db, datar, "MainURL")
+	// 			resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
+	// 			handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
+	// 			img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
+	// 			if dao.IsNoRowsError(err) {
+	// 				dataRes := &model.DataResource{
+	// 					HashCode:     hashCode,
+	// 					ResourceType: http.DetectContentType(resBinary),
+	// 					MainURL:      vv,
+	// 					JdsURL:       img,
+	// 				}
+	// 				if vv == v.DescImg {
+	// 					dataRes.Name = v.Name + "_desc"
+	// 					dataRes.UseType = model.ImgTypeDesc
+	// 				} else {
+	// 					dataRes.UseType = model.ImgTypeMain
+	// 					dataRes.Name = v.Name
+	// 				}
+	// 				dao.CreateEntity(db, dataRes)
+	// 			} else {
+	// 				if err == nil {
+	// 					datar.JdsURL = img
+	// 					dao.UpdateEntity(db, datar, "JdsURL")
+	// 				}
+	// 			}
+	// 		}
+	// 	}
+	// }
 	return err
 }
diff --git a/business/model/place.go b/business/model/place.go
index 7a67310d6..f0066327b 100644
--- a/business/model/place.go
+++ b/business/model/place.go
@@ -18,6 +18,7 @@ type Place struct {
 	TelCode   string `orm:"size(8);index" json:"telCode"`
 	JdCode    int    `orm:"index" json:"jdCode"` // 对应的京东代码
 	EbaiCode  int    `orm:"index" json:"ebaiCode"`
-	Enabled   int8   `json:"enabled"`   // 是否启用
-	MtpsPrice int    `json:"mtpsPrice"` // 分为单位
+	Enabled   int8   `json:"enabled"`             // 是否启用
+	MtpsPrice int    `json:"mtpsPrice"`           // 分为单位
+	JdsCode   int    `orm:"index" json:"jdsCode"` //京东商城代码
 }

From ba9d7c2a9d1a1dd5433089bc5e0131d16f6b21f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 16:08:25 +0800
Subject: [PATCH 102/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go              | 13 ++++++--
 business/model/dao/store.go               |  5 +++
 business/model/place.go                   |  6 ++--
 business/partner/partner.go               |  2 +-
 business/partner/purchase/ebai/store.go   |  4 +--
 business/partner/purchase/jd/store.go     |  4 +--
 business/partner/purchase/jdshop/store.go | 39 ++++++++++++++++++++---
 business/partner/purchase/mtwm/store.go   |  4 +--
 business/partner/purchase/yb/store.go     |  4 +--
 9 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 139ba4fa5..8eb73cd58 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -233,13 +233,14 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						var resultList []interface{}
+						var vendorStoreID string
 						storeMap := batchItemList[0].(*model.StoreMap)
 						db2 := db
 						if len(loopMapInfo.StoreMapList) > 1 {
 							db2 = dao.GetDB()
 						}
 						if model.IsSyncStatusNew(storeMap.SyncStatus) {
-							if err = handler.CreateStore2(db2, storeMap.StoreID, userName); err == nil {
+							if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName); err == nil {
 								resultList = append(resultList, 1)
 							} else {
 								failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "创建门店")
@@ -258,8 +259,14 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 							}
 						}
 						if err == nil {
-							storeMap.SyncStatus = 0
-							_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+							if model.IsSyncStatusNew(storeMap.SyncStatus) {
+								storeMap.VendorStoreID = vendorStoreID
+								storeMap.SyncStatus = 0
+								_, err = dao.UpdateEntity(db, storeMap, "VendorStoreID", model.FieldSyncStatus)
+							} else {
+								storeMap.SyncStatus = 0
+								_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+							}
 						}
 						return resultList, err
 					}, loopMapInfo.StoreMapList)
diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index eff45c71f..0da14fad9 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -37,6 +37,8 @@ type StoreDetail struct {
 
 	DistrictName string `json:"districtName"`
 	CityName     string `json:"cityName"`
+	ProvinceName string `json:"provinceName"` //省名
+	JdsCode      int    `json:"jdsCode"`      //京东商城地址代码
 
 	IsAutoOrder   int8   `json:"isAutoOrder"`   // 平台是否自动接单，-1：否，0：未知，1：是
 	MarketManName string `json:"marketManName"` //市场负责人
@@ -96,7 +98,9 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix,
 	t3.value price_percentage_pack_str,
 	t4.value freight_deduction_pack_str,
+	province.name province_name,
 	district.name district_name,
+	district.jds_code jds_code,
 	city.name city_name,
 	IF(mm.name <> '', mm.name, mm.user_id2) market_man_name,
 	IF(om.name <> '', om.name, om.user_id2) operator_name,
@@ -106,6 +110,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	LEFT JOIN store_map t2 ON t1.id = t2.store_id AND t2.vendor_id = ? AND t2.deleted_at = ?
 	LEFT JOIN place city ON city.code = t1.city_code
 	LEFT JOIN place district ON district.code = t1.district_code
+	LEFT JOIN place province ON city.parent_code = province.code
 	LEFT JOIN new_config t3 ON t3.key = t2.price_percentage_pack AND t3.type = ? AND t3.deleted_at = ?
 	LEFT JOIN new_config t4 ON t4.key = t2.freight_deduction_pack AND t4.type = ? AND t4.deleted_at = ?
 	LEFT JOIN user mm ON mm.mobile <> '' AND mm.mobile = t1.market_man_phone 
diff --git a/business/model/place.go b/business/model/place.go
index f0066327b..77be6a1fb 100644
--- a/business/model/place.go
+++ b/business/model/place.go
@@ -18,7 +18,7 @@ type Place struct {
 	TelCode   string `orm:"size(8);index" json:"telCode"`
 	JdCode    int    `orm:"index" json:"jdCode"` // 对应的京东代码
 	EbaiCode  int    `orm:"index" json:"ebaiCode"`
-	Enabled   int8   `json:"enabled"`             // 是否启用
-	MtpsPrice int    `json:"mtpsPrice"`           // 分为单位
-	JdsCode   int    `orm:"index" json:"jdsCode"` //京东商城代码
+	Enabled   int8   `json:"enabled"`   // 是否启用
+	MtpsPrice int    `json:"mtpsPrice"` // 分为单位
+	JdsCode   int    `json:"jdsCode"`   //京东商城代码
 }
diff --git a/business/partner/partner.go b/business/partner/partner.go
index d55b58383..a24968fb8 100644
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -147,7 +147,7 @@ type IPurchasePlatformHandler interface {
 	// Store
 	ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (store *dao.StoreDetail, err error)
 	UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error)
-	CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error)
+	CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error)
 	DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error)
 	GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (storeStatus int, err error)
 	UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string, storeID int64) (err error)
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 00418af6b..14c77b014 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -535,8 +535,8 @@ func (c *PurchaseHandler) GetShopIDsByPage() (vendorStoreIDs []string, err error
 	return vendorStoreIDs, err
 }
 
-func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
-	return err
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
+	return vendorStoreID, err
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 0da3a7740..28281f067 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -499,8 +499,8 @@ func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgC
 	return err
 }
 
-func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
-	return err
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
+	return vendorStoreID, err
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index e3a1e368c..2e7f9de75 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -1,7 +1,12 @@
 package jdshop
 
 import (
+	"encoding/base64"
+	"encoding/json"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -18,16 +23,31 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	return err
 }
 
-func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
 	store, err := dao.GetStoreDetail(db, storeID, model.VendorIDJDShop)
 	if err != nil {
-		return err
+		return vendorStoreID, err
 	}
+	data, _, err := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg)
+	timeMap := map[string]string{
+		"businessBeginTime": int2TimeStr(int(store.OpenTime1)),
+		"businessEndTime":   int2TimeStr(int(store.CloseTime1)),
+	}
+	timeJSON, _ := json.Marshal(timeMap)
 	createEntityStoreParam := &jdshopapi.CreateEntityStoreParam{
-		Name: store.Name,
+		Name:         store.Name,
+		AddCode:      store.JdsCode,
+		AddCodeName:  store.DistrictName,
+		AddName:      store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address,
+		Coordinate:   utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
+		Phone:        store.Tel1,
+		ExtendJSON:   string(timeJSON),
+		ImageFile:    base64.StdEncoding.EncodeToString(data),
+		CategoryName: jdshopapi.JdsStoreCategoryName,
+		CustomerID:   utils.Int2Str(store.ID),
 	}
-	err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
-	return err
+	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
+	return vendorStoreID, err
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
@@ -61,3 +81,12 @@ func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context, vendorOrg
 func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string, storeID int64) (err error) {
 	return err
 }
+
+func int2TimeStr(time int) (str string) {
+	str += utils.Int2Str(time / 1000)
+	str += utils.Int2Str(time % 1000 / 100)
+	str += ":"
+	str += utils.Int2Str(time % 100 / 10)
+	str += utils.Int2Str(time % 10)
+	return str
+}
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index a913e180d..f1db927f7 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -96,8 +96,8 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
 	return p.UpdateStore(db, storeID, userName)
 }
 
-func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
-	return err
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
+	return vendorStoreID, err
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
diff --git a/business/partner/purchase/yb/store.go b/business/partner/purchase/yb/store.go
index f66938e20..af4aa04a2 100644
--- a/business/partner/purchase/yb/store.go
+++ b/business/partner/purchase/yb/store.go
@@ -15,8 +15,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	return err
 }
 
-func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (err error) {
-	return err
+func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName string) (vendorStoreID string, err error) {
+	return vendorStoreID, err
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {

From da405609a838f9f145e44ce045e696686831a08d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 16:22:22 +0800
Subject: [PATCH 103/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 43 +++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ef9391b7b..f33257789 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1177,29 +1177,34 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	} else if vendorID == model.VendorIDJDShop {
 		storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
 	}
-	if err == nil {
-		dao.WrapAddIDCULDEntity(storeMap, userName)
-		if db == nil {
-			db = dao.GetDB()
-		}
-		dao.Begin(db)
-		defer func() {
-			if r := recover(); r != nil {
+	storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", true)
+	if len(storeMapList) > 0 {
+		_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
+	} else {
+		if err == nil {
+			dao.WrapAddIDCULDEntity(storeMap, userName)
+			if db == nil {
+				db = dao.GetDB()
+			}
+			dao.Begin(db)
+			defer func() {
+				if r := recover(); r != nil {
+					dao.Rollback(db)
+					panic(r)
+				}
+			}()
+			if err = dao.CreateEntity(db, storeMap); err == nil {
+				dao.Commit(db)
+				outStoreMap = storeMap
+				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
+			} else {
 				dao.Rollback(db)
-				panic(r)
 			}
-		}()
-		if err = dao.CreateEntity(db, storeMap); err == nil {
-			if globals.IsAddEvent {
-				err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
-			}
-			dao.Commit(db)
-			outStoreMap = storeMap
-			_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
-		} else {
-			dao.Rollback(db)
 		}
 	}
+	if globals.IsAddEvent {
+		err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
+	}
 	return outStoreMap, err
 }
 

From e7a3ae66786338c4d2f7f916ec6052ad5bcaf464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 16:26:19 +0800
Subject: [PATCH 104/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 2e7f9de75..a962b6dfa 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -39,7 +39,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		AddCode:      store.JdsCode,
 		AddCodeName:  store.DistrictName,
 		AddName:      store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address,
-		Coordinate:   utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
+		Coordinate:   utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
 		Phone:        store.Tel1,
 		ExtendJSON:   string(timeJSON),
 		ImageFile:    base64.StdEncoding.EncodeToString(data),

From a5a10fa53ca52b9b3cafefb34200154cc022ee63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 17:29:12 +0800
Subject: [PATCH 105/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index a962b6dfa..d0182a89b 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -20,6 +20,34 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 
 // stoerIDs为nil表示所有
 func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	store, err := dao.GetStoreDetail(db, storeID, model.VendorIDJDShop)
+	if err != nil {
+		return err
+	}
+	data, _, err := jxutils.DownloadFileByURL(jdshopapi.JdsStoreImg)
+	timeMap := map[string]string{
+		"businessBeginTime": int2TimeStr(int(store.OpenTime1)),
+		"businessEndTime":   int2TimeStr(int(store.CloseTime1)),
+	}
+	timeJSON, _ := json.Marshal(timeMap)
+	updateEntityStoreParam := &jdshopapi.UpdateEntityStoreParam{
+		StoreID:     utils.Str2Int(store.VendorStoreID),
+		Name:        store.Name,
+		AddCode:     store.JdsCode,
+		AddCodeName: store.DistrictName,
+		AddName:     store.ProvinceName + store.CityName + store.DistrictName + "@!" + store.Address,
+		Coordinate:  utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lat)) + "," + utils.Float64ToStr(jxutils.IntCoordinate2Standard(store.Lng)),
+		Phone:       store.Tel1,
+		ExtendJSON:  string(timeJSON),
+		ImageFile:   base64.StdEncoding.EncodeToString(data),
+	}
+	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
+	if err == nil {
+		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
+			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
+		}
+	}
 	return err
 }
 
@@ -90,3 +118,14 @@ func int2TimeStr(time int) (str string) {
 	str += utils.Int2Str(time % 10)
 	return str
 }
+
+func jxStatus2JdsStatus(status int) (result int) {
+	if status == model.StoreStatusOpened {
+		result = jdshopapi.JdsStoreStatusOnline
+	} else if status == model.StoreStatusHaveRest || status == model.StoreStatusClosed {
+		result = jdshopapi.JdsStoreStatusRest
+	} else {
+		result = jdshopapi.JdsStoreStatusDisable
+	}
+	return result
+}

From 2eb64fa152478d197cb85bd4910fb522c9c64a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 17:44:17 +0800
Subject: [PATCH 106/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 4 ++++
 business/jxstore/misc/misc.go          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 2ccf2ea58..f1bcbd8bc 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -590,6 +590,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	}
 	//如果平台是京东商城，则按商品skuname创建
 	if vendorID == model.VendorIDJDShop {
+		if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+			jdsCookie := configs[0].Value
+			api.JdShopAPI.SetCookie("thor", jdsCookie)
+		}
 		if len(createList) > 0 {
 			rList := changeList2Jds(createList)
 			createList = createList[:]
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 608b4521f..ceae9fb38 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	api.JdShopAPI.SetCookie("thor", jdsCookie)
 }
 
 func syncStoreSku() {

From b819be640d44481549a6d8fabf502830863aa829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 17:55:01 +0800
Subject: [PATCH 107/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go    | 4 ----
 business/partner/purchase/jdshop/store.go | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index f1bcbd8bc..2ccf2ea58 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -590,10 +590,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	}
 	//如果平台是京东商城，则按商品skuname创建
 	if vendorID == model.VendorIDJDShop {
-		if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-			jdsCookie := configs[0].Value
-			api.JdShopAPI.SetCookie("thor", jdsCookie)
-		}
 		if len(createList) > 0 {
 			rList := changeList2Jds(createList)
 			createList = createList[:]
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index d0182a89b..ad923ba0d 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -45,6 +45,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+			api.JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8A8C57DD560CF7359196563E623D38D86645912FA6F45288311E43F3C66E9B482E154A262CA6F647D9A7541EFD9D246A8391A25C4771B7AA6FCA60D3A745F62BD7903251BD5C9013167682D66528039829E46183AACE0BB4104BFB0D7FA948D689CAF9F13995067DAD9AE6B89E24DAB9E918504749B3331C8E2974A5C2994424D")
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}

From 4047911e1be069fd1bc8ebbb0f18d766673d8c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 18:08:03 +0800
Subject: [PATCH 108/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 1 -
 globals/api/api.go                        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index ad923ba0d..d0182a89b 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -45,7 +45,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			api.JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8A8C57DD560CF7359196563E623D38D86645912FA6F45288311E43F3C66E9B482E154A262CA6F647D9A7541EFD9D246A8391A25C4771B7AA6FCA60D3A745F62BD7903251BD5C9013167682D66528039829E46183AACE0BB4104BFB0D7FA948D689CAF9F13995067DAD9AE6B89E24DAB9E918504749B3331C8E2974A5C2994424D")
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}
diff --git a/globals/api/api.go b/globals/api/api.go
index 9fd4b40ec..1a8637f9d 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,6 +123,7 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
+		JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8A8C57DD560CF7359196563E623D38D86645912FA6F45288311E43F3C66E9B482E154A262CA6F647D9A7541EFD9D246A8391A25C4771B7AA6FCA60D3A745F62BD7903251BD5C9013167682D66528039829E46183AACE0BB4104BFB0D7FA948D689CAF9F13995067DAD9AE6B89E24DAB9E918504749B3331C8E2974A5C2994424D")
 	} else {
 		JdShopAPI = nil
 	}

From 1013bd7a04e3ed45880bea46cb19bb1b5ddbf013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 18:14:42 +0800
Subject: [PATCH 109/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 2 +-
 globals/api/api.go            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index ceae9fb38..608b4521f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookie("thor", jdsCookie)
+	api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/globals/api/api.go b/globals/api/api.go
index 1a8637f9d..9fd4b40ec 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,7 +123,6 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
-		JdShopAPI.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8A8C57DD560CF7359196563E623D38D86645912FA6F45288311E43F3C66E9B482E154A262CA6F647D9A7541EFD9D246A8391A25C4771B7AA6FCA60D3A745F62BD7903251BD5C9013167682D66528039829E46183AACE0BB4104BFB0D7FA948D689CAF9F13995067DAD9AE6B89E24DAB9E918504749B3331C8E2974A5C2994424D")
 	} else {
 		JdShopAPI = nil
 	}

From 297978663bf072bb33ca6700593671b5be47921e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 15 May 2020 18:19:47 +0800
Subject: [PATCH 110/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 608b4521f..2ab754f08 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -294,6 +294,7 @@ func Init() {
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
 		jdsCookie = configs[0].Value
+		fmt.Println("test111111111111111111111", jdsCookie)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value

From 6e0229805b3658c0a0191ef5085cd1898eb8e33a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sat, 16 May 2020 13:47:09 +0800
Subject: [PATCH 111/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=BF=AB=E9=80=92?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=96=E5=BF=AB=E9=80=92=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index aaf0d6761..cd0080fbf 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -151,8 +151,10 @@ var (
 		6039390: 200,
 	}
 
-	regexpCnameAndCmobile = regexp.MustCompile(`配送员，(.*)，手机号，(.*)`)
-	bagSkuMap             = map[int]int{ //京西物料袋子skuid
+	regexpCnameAndCmobile  = regexp.MustCompile(`配送员，(.*)，手机号，(.*)`)
+	regexpCnameAndCmobile2 = regexp.MustCompile(`快递员：(.*)，联系电话：(.*)`)
+
+	bagSkuMap = map[int]int{ //京西物料袋子skuid
 		6039382: 6039382,
 		6039383: 6039383,
 		6039384: 6039384,
@@ -1477,8 +1479,16 @@ func updateJdWayBillInfo(db *dao.DaoDB, order *model.GoodsOrder, getTrackMessage
 	for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
 		if vv.OpeTitle == "配送员收货" {
 			result := regexpCnameAndCmobile.FindAllStringSubmatch(vv.OpeRemark, -1)
-			cName = result[0][1]
-			cMobile = result[0][2]
+			if len(result) > 0 {
+				cName = result[0][1]
+				cMobile = result[0][2]
+			} else {
+				result2 := regexpCnameAndCmobile2.FindAllStringSubmatch(vv.OpeRemark, -1)
+				if len(result2) > 0 {
+					cName = result[0][1]
+					cMobile = result[0][2]
+				}
+			}
 			break
 		}
 	}

From 9c3066580159469e86138af97056dd1f7b29dda7 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sat, 16 May 2020 13:55:40 +0800
Subject: [PATCH 112/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=BF=AB=E9=80=92?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=96=E5=BF=AB=E9=80=92=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index cd0080fbf..840223ac5 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -152,7 +152,7 @@ var (
 	}
 
 	regexpCnameAndCmobile  = regexp.MustCompile(`配送员，(.*)，手机号，(.*)`)
-	regexpCnameAndCmobile2 = regexp.MustCompile(`快递员：(.*)，联系电话：(.*)`)
+	regexpCnameAndCmobile2 = regexp.MustCompile(`（快递员：(.*)，联系电话：(.*)）`)
 
 	bagSkuMap = map[int]int{ //京西物料袋子skuid
 		6039382: 6039382,
@@ -1485,8 +1485,8 @@ func updateJdWayBillInfo(db *dao.DaoDB, order *model.GoodsOrder, getTrackMessage
 			} else {
 				result2 := regexpCnameAndCmobile2.FindAllStringSubmatch(vv.OpeRemark, -1)
 				if len(result2) > 0 {
-					cName = result[0][1]
-					cMobile = result[0][2]
+					cName = result2[0][1]
+					cMobile = result2[0][2]
 				}
 			}
 			break

From d5f2e1eaa0c94c3b1d687192fe8f4da67ccfd7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 09:07:09 +0800
Subject: [PATCH 113/285] =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BB=B7=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go         | 33 ++++++++++---------
 business/jxstore/misc/misc.go                 |  1 -
 business/partner/purchase/jdshop/store_sku.go | 18 +++++-----
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index c53a00978..379fe52eb 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -377,27 +377,28 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 		//TODO 重复购买有活动且结算价大于0的商品需要拆分，第一个商品按结算价，后面的商品按shopprice 或者 saleprice, 2020-05-06
 		//TODO 京东美团的订单，做活动的商品之前就会拆分出来，所以只做更新，饿百暂时不管， 2020-05-07
 		//TODO 不根据商品是否拆分，直接根据该商品做了活动，并且他的vendorPrice 和 salePrice 相等，就按新规则结算， 2020-05-11
+		//TODO 现在不判断商品做没做活动，只要vendorPrice和salePrice不等，就默认为做了活动，不做活动的商品就按新规则结算，2020-05-18
 		if order.VendorID == model.VendorIDJD || order.VendorID == model.VendorIDMTWM {
 			for _, v := range orderSkus {
 				if v.EarningPrice > 0 {
-					var storeID int
-					if order.StoreID == 0 {
-						storeID = order.JxStoreID
-					} else {
-						storeID = order.StoreID
-					}
-					result, err := dao.GetEffectiveActStoreSkuInfo2(db, 0, []int{order.VendorID}, []int{model.ActSkuSecKill, model.ActSkuDirectDown}, []int{storeID}, []int{v.SkuID}, order.OrderCreatedAt, order.OrderCreatedAt)
-					if (len(result) > 0 && err == nil) || v.IsVendorAct == model.YES {
-						if v.VendorPrice == v.SalePrice {
-							var earningPrice = 0
-							if v.ShopPrice < v.SalePrice {
-								earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.ShopPrice)) * utils.Int2Float64(storePayPercentage) / 100)))
-							} else {
-								earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.SalePrice)) * utils.Int2Float64(storePayPercentage) / 100)))
-							}
-							v.EarningPrice = int64(earningPrice)
+					// var storeID int
+					// if order.StoreID == 0 {
+					// 	storeID = order.JxStoreID
+					// } else {
+					// 	storeID = order.StoreID
+					// }
+					// result, err := dao.GetEffectiveActStoreSkuInfo2(db, 0, []int{order.VendorID}, []int{model.ActSkuSecKill, model.ActSkuDirectDown}, []int{storeID}, []int{v.SkuID}, order.OrderCreatedAt, order.OrderCreatedAt)
+					// if (len(result) > 0 && err == nil) || v.IsVendorAct == model.YES {
+					if v.VendorPrice == v.SalePrice {
+						var earningPrice = 0
+						if v.ShopPrice < v.SalePrice {
+							earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.ShopPrice)) * utils.Int2Float64(storePayPercentage) / 100)))
+						} else {
+							earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.SalePrice)) * utils.Int2Float64(storePayPercentage) / 100)))
 						}
+						v.EarningPrice = int64(earningPrice)
 					}
+					// }
 				}
 			}
 		}
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 2ab754f08..608b4521f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -294,7 +294,6 @@ func Init() {
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
 		jdsCookie = configs[0].Value
-		fmt.Println("test111111111111111111111", jdsCookie)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 3f96d187a..e5d0b3f6f 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -93,15 +93,15 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		for _, v := range storeSkuList {
-			err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
-			if err == nil {
-				err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
-			}
-		}
-		if err != nil {
-			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
-		}
+		// for _, v := range storeSkuList {
+		// 	err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
+		// 	if err == nil {
+		// 		err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+		// 	}
+		// }
+		// if err != nil {
+		// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
+		// }
 	}
 	return failedList, err
 }

From a3565b85a164506dfd5b91a8d94a69ce465716d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 09:41:29 +0800
Subject: [PATCH 114/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=A4=9A=E9=97=A8=E5=BA=97=E5=B9=B3=E5=8F=B0id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 39 ++++++++++++++++---------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index bd170cf6f..a9aec6206 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1498,25 +1498,26 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	db := dao.GetDB()
-	result1, _ := api.JdShopAPI.GetProvince()
-	for _, v := range result1 {
-		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-		place1.JdsCode = v.AreaID
-		dao.UpdateEntity(db, place1, "JdsCode")
-		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-		for _, vv := range result2 {
-			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-			place2.JdsCode = vv.AreaID
-			dao.UpdateEntity(db, place2, "JdsCode")
-			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-			for _, vvv := range result3 {
-				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-				place3.JdsCode = vvv.AreaID
-				dao.UpdateEntity(db, place3, "JdsCode")
-			}
-		}
-	}
+	fmt.Println("test11111111111111111", partner.GetMultiStoreVendorIDs())
+	// db := dao.GetDB()
+	// result1, _ := api.JdShopAPI.GetProvince()
+	// for _, v := range result1 {
+	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+	// 	place1.JdsCode = v.AreaID
+	// 	dao.UpdateEntity(db, place1, "JdsCode")
+	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+	// 	for _, vv := range result2 {
+	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+	// 		place2.JdsCode = vv.AreaID
+	// 		dao.UpdateEntity(db, place2, "JdsCode")
+	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+	// 		for _, vvv := range result3 {
+	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+	// 			place3.JdsCode = vvv.AreaID
+	// 			dao.UpdateEntity(db, place3, "JdsCode")
+	// 		}
+	// 	}
+	// }
 	// var (
 	// 	skuNames []*model.SkuName
 	// 	db       = dao.GetDB()

From dc4da12e73290dac1a981c304a8d8696a507c18c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 10:25:10 +0800
Subject: [PATCH 115/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=BB=93=E7=AE=97=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go |  3 +++
 business/jxstore/tempop/tempop.go     | 39 +++++++++++++--------------
 business/model/dao/act.go             |  4 +--
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 379fe52eb..6848b520c 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -423,6 +423,9 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 		}
 	}
 	if len(skuIDMap) > 0 {
+		if order.VendorOrderID == "5000356075877900459" {
+			fmt.Println("testupdateSingleOrderEarningPrice", order.VendorOrderID)
+		}
 		actStoreSkuList, err := dao.GetEffectiveActStoreSkuInfo(db, 0, []int{order.VendorID}, model.ActTypeAll, []int{jxStoreID}, jxutils.IntMap2List(skuIDMap), order.OrderCreatedAt, order.OrderCreatedAt)
 		if err != nil {
 			globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku promotion info for error:%v", err)
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index a9aec6206..bd170cf6f 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1498,26 +1498,25 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	fmt.Println("test11111111111111111", partner.GetMultiStoreVendorIDs())
-	// db := dao.GetDB()
-	// result1, _ := api.JdShopAPI.GetProvince()
-	// for _, v := range result1 {
-	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-	// 	place1.JdsCode = v.AreaID
-	// 	dao.UpdateEntity(db, place1, "JdsCode")
-	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-	// 	for _, vv := range result2 {
-	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-	// 		place2.JdsCode = vv.AreaID
-	// 		dao.UpdateEntity(db, place2, "JdsCode")
-	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-	// 		for _, vvv := range result3 {
-	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-	// 			place3.JdsCode = vvv.AreaID
-	// 			dao.UpdateEntity(db, place3, "JdsCode")
-	// 		}
-	// 	}
-	// }
+	db := dao.GetDB()
+	result1, _ := api.JdShopAPI.GetProvince()
+	for _, v := range result1 {
+		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+		place1.JdsCode = v.AreaID
+		dao.UpdateEntity(db, place1, "JdsCode")
+		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+		for _, vv := range result2 {
+			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+			place2.JdsCode = vv.AreaID
+			dao.UpdateEntity(db, place2, "JdsCode")
+			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+			for _, vvv := range result3 {
+				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+				place3.JdsCode = vvv.AreaID
+				dao.UpdateEntity(db, place3, "JdsCode")
+			}
+		}
+	}
 	// var (
 	// 	skuNames []*model.SkuName
 	// 	db       = dao.GetDB()
diff --git a/business/model/dao/act.go b/business/model/dao/act.go
index ff5049cf4..313e6eae2 100644
--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -413,8 +413,8 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 	if globals.IsStoreSkuAct {
 		sql += " AND t1.is_special = 0"
 	}
-	// globals.SugarLogger.Debug(sql)
-	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
+	fmt.Println(sql)
+	fmt.Println(sqlParams)
 	err = GetRows(db, &actStoreSkuList, sql, sqlParams...)
 	return actStoreSkuList, err
 }

From bbc9d030ba737a2dc9e636f42298094142162e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 10:49:21 +0800
Subject: [PATCH 116/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=BB=93=E7=AE=97=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 3 +++
 business/model/dao/act.go             | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 6848b520c..cc21f5a4c 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -434,6 +434,9 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 			for _, v := range order.Skus {
 				if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 {
 					if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil {
+						if skuID == 30611 {
+							fmt.Println("testGetActStoreSku", utils.Format4Output(actStoreSku, false))
+						}
 						v.EarningPrice = actStoreSku.EarningPrice
 						if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
 							v.StoreSubID = actStoreSku.ActID
diff --git a/business/model/dao/act.go b/business/model/dao/act.go
index 313e6eae2..3ed92ef4c 100644
--- a/business/model/dao/act.go
+++ b/business/model/dao/act.go
@@ -413,8 +413,6 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 	if globals.IsStoreSkuAct {
 		sql += " AND t1.is_special = 0"
 	}
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	err = GetRows(db, &actStoreSkuList, sql, sqlParams...)
 	return actStoreSkuList, err
 }

From 457dd5e76dba6dd22dce886f44edc9a0a87466f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 11:07:42 +0800
Subject: [PATCH 117/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E7=94=B5=E8=AF=9D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 3 ---
 business/partner/purchase/jd/store.go | 8 ++++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index cc21f5a4c..6848b520c 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -434,9 +434,6 @@ func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 			for _, v := range order.Skus {
 				if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 {
 					if actStoreSku := actStoreSkuMap.GetActStoreSku(jxStoreID, skuID, order.VendorID); actStoreSku != nil {
-						if skuID == 30611 {
-							fmt.Println("testGetActStoreSku", utils.Format4Output(actStoreSku, false))
-						}
 						v.EarningPrice = actStoreSku.EarningPrice
 						if true { //v.StoreSubName != "" { // 之前这里为什么要加判断？
 							v.StoreSubID = actStoreSku.ActID
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 28281f067..a16eeb6b4 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -41,6 +41,10 @@ var (
 	}
 )
 
+const (
+	JdTe1 = "18011597879"
+)
+
 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (*dao.StoreDetail, error) {
 	a := getAPI(vendorOrgCode)
 	result, err := a.GetStoreInfoByStationNo2(vendorStoreID)
@@ -141,8 +145,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			storeParams := &jdapi.OpStoreParams{
 				StationNo: store.VendorStoreID,
 				Operator:  userName,
-				Phone:     store.Tel1,
-				Mobile:    store.Tel2,
+				Phone:     JdTe1,
+				Mobile:    store.Tel1,
 			}
 			if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
 				storeParams.OutSystemID = utils.Int2Str(int(store.ID))

From da1473e893560525e3185447598849db11c33468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 14:19:14 +0800
Subject: [PATCH 118/285] =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=BB=9F=E4=B8=80=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store.go                 |  2 ++
 business/partner/purchase/ebai/store.go | 17 +++++++++--------
 business/partner/purchase/jd/store.go   |  6 +-----
 business/partner/purchase/mtwm/store.go |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/business/model/store.go b/business/model/store.go
index ce942a06f..9f425bafc 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -59,6 +59,8 @@ const (
 	ExdStoreName            = "饿鲜达"
 	MatterStoreID           = 666666
 	JdShopMainVendorStoreID = "999999"
+
+	VendorStoreTel = "18011597879"
 )
 
 var (
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 14c77b014..2ec56b65e 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -375,14 +375,15 @@ func ebaiOpTime2Jx(businessTime interface{}) (opTimeList []int16) {
 
 func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
 	params := fillOpTimeParams(nil, store.GetOpTimeList())
-	tel := store.Tel1
-	if tel == "" {
-		tel = store.Tel2
-	}
-	if tel != "" {
-		// params["phone"] = tel     // 外卖客服联系电话，这个有时能修改，有时不能修改，暂时统一不改
-		params["ivr_phone"] = tel // 订单提醒电话
-	}
+	// tel := store.Tel1
+	// if tel == "" {
+	// 	tel = store.Tel2
+	// }
+	// if tel != "" {
+	// 	// params["phone"] = tel     // 外卖客服联系电话，这个有时能修改，有时不能修改，暂时统一不改
+	// 	params["ivr_phone"] = tel // 订单提醒电话
+	// }
+	params["ivr_phone"] = model.VendorStoreTel //统一改为这个电话
 	if store.VendorStoreID != "" {
 		params["baidu_shop_id"] = store.VendorStoreID
 	}
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index a16eeb6b4..29a237575 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -41,10 +41,6 @@ var (
 	}
 )
 
-const (
-	JdTe1 = "18011597879"
-)
-
 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (*dao.StoreDetail, error) {
 	a := getAPI(vendorOrgCode)
 	result, err := a.GetStoreInfoByStationNo2(vendorStoreID)
@@ -145,7 +141,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			storeParams := &jdapi.OpStoreParams{
 				StationNo: store.VendorStoreID,
 				Operator:  userName,
-				Phone:     JdTe1,
+				Phone:     model.VendorStoreTel,
 				Mobile:    store.Tel1,
 			}
 			if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index f1db927f7..55768ce47 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -135,7 +135,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		"address":        storeDetail.Address, // 美团好像地址也不能改的?
 		"longitude":      jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Longitude)),
 		"latitude":       jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Latitude)),
-		"phone":          storeDetail.Tel1,
+		"phone":          model.VendorStoreTel,
 		"shipping_fee":   remoteStoreInfo.ShippingFee,
 		"shipping_time":  remoteStoreInfo.ShippingTime,
 		"open_level":     remoteStoreInfo.OpenLevel,

From 08c6afd3b49e6db0ba9de3b8a3b37dc8116a8a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 14:34:50 +0800
Subject: [PATCH 119/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index d0182a89b..76a223e0f 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -40,6 +40,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		Phone:       store.Tel1,
 		ExtendJSON:  string(timeJSON),
 		ImageFile:   base64.StdEncoding.EncodeToString(data),
+		CustomerID:  utils.Int2Str(store.ID),
 	}
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	if err == nil {

From 434c8033773f62fe389134239c31a74abe1aa204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 15:55:26 +0800
Subject: [PATCH 120/285] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E9=97=A8=E5=BA=97=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 25 +++++++++++++++++++++++++
 business/model/store.go       |  1 +
 2 files changed, 26 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index f33257789..78393e4ab 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1202,6 +1202,13 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 			}
 		}
 	}
+	if vendorID == model.VendorIDJDShop {
+		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
+		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
+		if _, err = SetStoreSkuSyncStatus2(db, nil, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
+			CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, false, true)
+		}
+	}
 	if globals.IsAddEvent {
 		err = AddEventDetail(db, ctx, model.OperateAdd, vendorID, model.ThingTypeStore, storeID, "", `{"VendorID":`+utils.Int2Str(vendorID)+`}`)
 	}
@@ -3133,3 +3140,21 @@ func DeleteStoreCategroies(ctx *jxcontext.Context, db *dao.DaoDB, storeID int) (
 	err = dao.DeleteStoreCategroies(db, ctx.GetUserName(), storeID)
 	return err
 }
+
+func findSkusBetweenJdsMainStore(db *dao.DaoDB, storeID int) (skus []int) {
+	var skuMap = make(map[int]int)
+	storeSkus1, _ := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
+	storeSkus2, _ := dao.GetStoresSkusInfo(db, []int{storeID}, nil)
+	for _, v := range storeSkus1 {
+		if v.Status == model.SkuStatusNormal {
+			skuMap[v.SkuID] = 1
+		}
+	}
+	for _, v := range storeSkus2 {
+		if v.Status == model.SkuStatusNormal && skuMap[v.SkuID] != 0 {
+			skus = append(skus, v.SkuID)
+		}
+	}
+	fmt.Println("testskus", skus)
+	return skus
+}
diff --git a/business/model/store.go b/business/model/store.go
index 9f425bafc..0a441824a 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -59,6 +59,7 @@ const (
 	ExdStoreName            = "饿鲜达"
 	MatterStoreID           = 666666
 	JdShopMainVendorStoreID = "999999"
+	JdShopMainStoreID       = 102919
 
 	VendorStoreTel = "18011597879"
 )

From 4a15e4fc96da8a4fb752b72194edb62090991293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 May 2020 18:13:11 +0800
Subject: [PATCH 121/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E5=8F=AF=E5=94=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                 | 17 +++++-
 business/jxstore/cms/store_sku.go             | 16 +++---
 business/partner/purchase/jdshop/store.go     | 29 +++++++++++
 business/partner/purchase/jdshop/store_sku.go | 52 ++++++++++++-------
 controllers/cms_store_sku.go                  |  2 +-
 5 files changed, 87 insertions(+), 29 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 78393e4ab..ce553e4ed 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1175,7 +1175,22 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 			return nil, err
 		}
 	} else if vendorID == model.VendorIDJDShop {
-		storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
+		if storeMap.VendorStoreID == "" {
+			storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
+		} else {
+			if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
+				store, err2 := handler.ReadStore(ctx, vendorOrgCode, storeMap.VendorStoreID)
+				if err = err2; err == nil || storeMap.IsSync == 0 {
+					if store != nil {
+						storeMap.Status = store.Status
+					}
+					err = nil
+					storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress
+				}
+			} else {
+				err = ErrCanNotFindVendor
+			}
+		}
 	}
 	storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", true)
 	if len(storeMapList) > 0 {
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 37941668b..01c27327f 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -853,7 +853,7 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
 	return hint, err
 }
 
-func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, skuBindInfos []*StoreSkuBindInfo, isAsync, isContinueWhenError bool) (hint string, err error) {
+func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, skuBindInfos []*StoreSkuBindInfo, isAsync, isContinueWhenError, isFos bool) (hint string, err error) {
 	// if len(skuBindInfos) > maxStoreNameBind {
 	// 	return "", fmt.Errorf("门店商品信息大于%d", maxStoreNameBind)
 	// }
@@ -892,7 +892,7 @@ func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, sk
 	isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
 	if num > 0 {
 		skuIDs := jxutils.IntMap2List(skuIDMap)
-		hint, err = CurVendorSync.SyncStoresSkus(ctx, parentTask, 0, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
+		hint, err = CurVendorSync.SyncStoresSkus(ctx, parentTask, 0, db, nil, storeIDs, skuIDs, isFos, isAsync, isContinueWhenError)
 	}
 	if num == 0 || !isAsync || hint == "" {
 		hint = utils.Int64ToStr(num)
@@ -3111,7 +3111,7 @@ func FocusStoreSkusByExcelBin(ctx *jxcontext.Context, reader io.Reader, isAsync,
 			for _, v := range result1 {
 				skuBindInfos = append(skuBindInfos, v.(*StoreSkuBindInfo))
 			}
-			UpdateStoresSkusByBind(ctx, task, skuBindInfos, true, true)
+			UpdateStoresSkusByBind(ctx, task, skuBindInfos, true, true, false)
 		}
 		return result, err
 	}
@@ -3206,7 +3206,7 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuBindInfos []*StoreSkuBindInf
 			for _, v := range result1 {
 				skuBindInfos = append(skuBindInfos, v.(*StoreSkuBindInfo))
 			}
-			hint, err = UpdateStoresSkusByBind(ctx, task, skuBindInfos, isAsync, isContinueWhenError)
+			hint, err = UpdateStoresSkusByBind(ctx, task, skuBindInfos, isAsync, isContinueWhenError, true)
 		}
 		return result, err
 	}
@@ -3302,7 +3302,7 @@ func AutoFocusStoreSkusForTopSkus(ctx *jxcontext.Context, isAsync, isContinueWhe
 			for _, v := range result1 {
 				skuBindInfos = append(skuBindInfos, v.(*StoreSkuBindInfo))
 			}
-			hint, err = UpdateStoresSkusByBind(ctx, nil, skuBindInfos, isAsync, isContinueWhenError)
+			hint, err = UpdateStoresSkusByBind(ctx, nil, skuBindInfos, isAsync, isContinueWhenError, false)
 		}
 		return result, err
 	}
@@ -3797,7 +3797,7 @@ func RefreshJxPriceByVendor(ctx *jxcontext.Context, jdStoreSkus []*JdStoreSkus,
 				}
 			}
 		case 1:
-			_, err = UpdateStoresSkusByBind(ctx, nil, param, isAsync, isContinueWhenError)
+			_, err = UpdateStoresSkusByBind(ctx, nil, param, isAsync, isContinueWhenError, false)
 		}
 		return result, err
 	}
@@ -3880,7 +3880,7 @@ func RefreshJxPriceByVendor2(ctx *jxcontext.Context, storeIDs []int, vendorID in
 				}
 			}
 		case 1:
-			_, err = UpdateStoresSkusByBind(ctx, nil, param, isAsync, isContinueWhenError)
+			_, err = UpdateStoresSkusByBind(ctx, nil, param, isAsync, isContinueWhenError, false)
 		}
 		return result, err
 	}
@@ -4132,7 +4132,7 @@ func CreateSkusAndFocusFromWx(ctx *jxcontext.Context, productInfo *jdapi.Product
 			IsSale:    1,
 		}
 		skuBindInfos = append(skuBindInfos, skuBindInfo)
-		_, err := UpdateStoresSkusByBind(ctx, nil, skuBindInfos, true, true)
+		_, err := UpdateStoresSkusByBind(ctx, nil, skuBindInfos, true, true, false)
 		if err != nil {
 			err = nil
 		}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 76a223e0f..4027a6466 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
+	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 	"git.rosy.net.cn/baseapi/utils"
@@ -15,6 +16,18 @@ import (
 )
 
 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (storeDetail *dao.StoreDetail, err error) {
+	result, err := api.JdShopAPI.NewInfoList(utils.Str2Int64(vendorStoreID))
+	storeDetail.VendorStoreID = vendorStoreID
+	storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus)
+	result2, err := api.JdShopAPI.QueryEntityStore(utils.Str2Int64(vendorStoreID))
+	storeDetail.ID = utils.Str2Int(result2.ExStoreID)
+	storeDetail.Name = result2.StoreName
+	storeDetail.Address = result2.Address
+	storeDetail.Tel1 = result2.Phone
+	storeDetail.DistrictCode = result2.AddrCode
+	zbs := strings.Split(result2.Coordinate, ",")
+	storeDetail.Lat = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[0]))
+	storeDetail.Lng = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[1]))
 	return storeDetail, err
 }
 
@@ -80,6 +93,11 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 }
 
 func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName string) (err error) {
+	// store, err := dao.GetStoreDetail(db, storeID, model.VendorIDJDShop)
+	// if err != nil {
+	// 	return err
+	// }
+	// err = api.JdShopAPI.DeleteStoresByID(utils.Str2Int64(store.VendorStoreID))
 	return err
 }
 
@@ -130,3 +148,14 @@ func jxStatus2JdsStatus(status int) (result int) {
 	}
 	return result
 }
+
+func JdsStatus2jxStatus(status int) (result int) {
+	if status == jdshopapi.JdsStoreStatusOnline {
+		result = model.StoreStatusOpened
+	} else if status == jdshopapi.JdsStoreStatusRest {
+		result = model.StoreStatusClosed
+	} else {
+		result = model.StoreStatusDisabled
+	}
+	return result
+}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index e5d0b3f6f..033f06c74 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -77,9 +77,10 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			// valid := dao.StrictMakeMapByStructObject(payload, skuName, ctx.GetUserName())
 			name := filterSensitiveWord(v.Name)
 			updateWareParam := &jdshopapi.UpdateWareParam{
-				WareID:   v.JdsWareID,
-				Title:    name,
-				VenderID: jdshopapi.VenderID,
+				WareID:    v.JdsWareID,
+				Title:     name,
+				VenderID:  jdshopapi.VenderID,
+				PromiseID: jdshopapi.JdsPromiseID,
 				// Weight: v.Weight,
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
@@ -333,11 +334,12 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		Weight:     0.5,
 		JdPrice:    jxutils.IntPrice2Standard(storeSku.UnitPrice),
 		// MarketPrice: jxutils.IntPrice2Standard(storeSku.UnitPrice),
+		PromiseID: jdshopapi.JdsPromiseID,
 	}
 
 	//上传京东图片
 	//规则，有两张就传两张，没有就重复传一张
-	pic1, err := uploadImg(storeSku.Img, storeSku.Name, "1")
+	pic1, err := uploadImg(storeSku.Img, name, "1")
 	img1 := &jdshopapi.CreateSkuParamImages{
 		ColorID:  "0000000000",
 		ImgIndex: 1,
@@ -350,7 +352,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	if storeSku.Img2 == "" {
 		img2.ImgURL = pic1
 	} else {
-		pic2, err2 := uploadImg(storeSku.Img, storeSku.Name, "2")
+		pic2, err2 := uploadImg(storeSku.Img, name, "2")
 		err = err2
 		img2.ImgURL = pic2
 	}
@@ -361,7 +363,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	//商品详情拼接
 	var desc string
 	if storeSku.DescImg != "" {
-		pic3, err2 := uploadImg(storeSku.DescImg, storeSku.Name, "desc")
+		pic3, err2 := uploadImg(storeSku.DescImg, name, "desc")
 		err = err2
 		desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
 	} else {
@@ -459,11 +461,11 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsPropSku = append(attrsPropSku, attrSku)
 		sku := &jdshopapi.CreateSkuParamSkus{
-			JdPrice:  jxutils.IntPrice2Standard(v.VendorPrice),
-			StockNum: 9999,
-			Type:     "com.jd.pop.ware.ic.api.domain.sku",
-			Type2:    "com.jd.pop.ware.ic.api.domain.Sku",
-			OuterID:  utils.Int2Str(v.SkuID),
+			JdPrice: jxutils.IntPrice2Standard(v.VendorPrice),
+			// StockNum: 9999,
+			Type:    "com.jd.pop.ware.ic.api.domain.sku",
+			Type2:   "com.jd.pop.ware.ic.api.domain.Sku",
+			OuterID: utils.Int2Str(v.SkuID),
 		}
 		sku.SaleAttrs = attrsPropSku
 		createSkuParamSkus = append(createSkuParamSkus, sku)
@@ -471,21 +473,33 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		if v.VendorPrice > vendorPrice {
 			vendorPrice = v.VendorPrice
 		}
+		if v.Status == model.SkuStatusNormal {
+			sku.StockNum = 9999
+		} else {
+			sku.StockNum = 0
+		}
 	}
 	createSkuParamWare.MarketPrice = jxutils.IntPrice2Standard(vendorPrice)
 	return createSkuParamWare, createSkuParamSkus, err
 }
 
+//京东商城上传图片，若平台上已经有了这个图就直接拿来用了
 func uploadImg(img, name, index string) (imgURL string, err error) {
-	data, _, err := jxutils.DownloadFileByURL(img)
-	if err != nil {
-		return imgURL, err
+	result, err := api.JdShopAPI.QueryPicture(name + index)
+	if len(result) > 0 {
+		imgURL = result[0].PictureURL
+	} else {
+		data, _, err := jxutils.DownloadFileByURL(img)
+		if err != nil {
+			return imgURL, err
+		}
+		uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, name+index)
+		if err != nil {
+			return imgURL, err
+		}
+		imgURL = uploadResult.PictureURL
 	}
-	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, name+index)
-	if err != nil {
-		return imgURL, err
-	}
-	return uploadResult.PictureURL, err
+	return imgURL, err
 }
 
 func filterSensitiveWord(name string) (result string) {
diff --git a/controllers/cms_store_sku.go b/controllers/cms_store_sku.go
index 0a03ae6a8..1adad8330 100644
--- a/controllers/cms_store_sku.go
+++ b/controllers/cms_store_sku.go
@@ -246,7 +246,7 @@ func (c *StoreSkuController) UpdateStoresSkusByBind() {
 		if err = jxutils.Strings2Objs(params.Payload, &skuBindInfos); err != nil {
 			return retVal, "", err
 		}
-		retVal, err = cms.UpdateStoresSkusByBind(params.Ctx, nil, skuBindInfos, params.IsAsync, params.IsContinueWhenError)
+		retVal, err = cms.UpdateStoresSkusByBind(params.Ctx, nil, skuBindInfos, params.IsAsync, params.IsContinueWhenError, false)
 		return retVal, "", err
 	})
 }

From 2e534cc6e8c5fc76b130997e93d46d4ea440ca2f 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, 19 May 2020 08:31:49 +0800
Subject: [PATCH 122/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 01c27327f..1a27ecd1d 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -886,6 +886,7 @@ func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, sk
 		for _, v := range skuIDs {
 			skuIDMap[v] = 1
 		}
+		fmt.Println("test111111", skuIDs)
 		num += int64(len(skuIDs))
 	}
 	// dao.Commit(db)

From 15583d7eca5eaf716dc8a5a1791e4a1f7f440d2b 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, 19 May 2020 08:39:54 +0800
Subject: [PATCH 123/285] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E5=8D=B3=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 1 -
 business/partner/purchase/jx/localjx/order.go | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 1a27ecd1d..01c27327f 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -886,7 +886,6 @@ func UpdateStoresSkusByBind(ctx *jxcontext.Context, parentTask tasksch.ITask, sk
 		for _, v := range skuIDs {
 			skuIDMap[v] = 1
 		}
-		fmt.Println("test111111", skuIDs)
 		num += int64(len(skuIDs))
 	}
 	// dao.Commit(db)
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 840223ac5..6cde18c05 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -338,6 +338,9 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
 		}
 		beginDate = beginDate.Add(24 * time.Hour)
 	}
+	if len(deliverTimerList) > 0 {
+		deliverTimerList[0].TimeList[0].ViewTime = "营业即送"
+	}
 	return deliverTimerList, err
 }
 

From 5ccad643d83e92ec0646d432f30e51960c101b35 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, 19 May 2020 08:45:51 +0800
Subject: [PATCH 124/285] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E5=8D=B3=E9=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jx/localjx/order.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 6cde18c05..4613a34fd 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -339,7 +339,9 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
 		beginDate = beginDate.Add(24 * time.Hour)
 	}
 	if len(deliverTimerList) > 0 {
-		deliverTimerList[0].TimeList[0].ViewTime = "营业即送"
+		if deliverTimerList[0].TimeList[0].UnixTime != 0 {
+			deliverTimerList[0].TimeList[0].ViewTime = "营业即送"
+		}
 	}
 	return deliverTimerList, err
 }

From 8fbe43199b4474340d078262fc380c0acb9fe414 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, 19 May 2020 09:08:42 +0800
Subject: [PATCH 125/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95jdscookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 +-
 business/jxstore/misc/misc.go | 8 ++++----
 globals/api/api.go            | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ce553e4ed..a9f08249a 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1221,7 +1221,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
 		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
 		if _, err = SetStoreSkuSyncStatus2(db, nil, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
-			CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, false, true)
+			CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true)
 		}
 	}
 	if globals.IsAddEvent {
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 608b4521f..f2c07494f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -292,9 +292,9 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
-	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-		jdsCookie = configs[0].Value
-	}
+	// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+	// 	jdsCookie = configs[0].Value
+	// }
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	// api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/globals/api/api.go b/globals/api/api.go
index 9fd4b40ec..d68c84951 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,6 +123,9 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
+		JdShopAPI.SetCookieWithStr(`
+			shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIEY252TEDX4TNI26TYYNQKR53PLV4NA7VLZHCQSBGGXOUZA57E3KGVXVOW3S2PCV5UG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEGWEACMF55RVZFQZRYUO4LVOJ2Q; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5P4YUR5KISNNHYQLAU4AT5AJH2MD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOMZSJUMU5VPVFSYLMBPOGZARWRVZ2Z57ZZHGMS6C2W7LMPJ74WPXTF4QUQ23OH3RMQFVM4C4IFXK3FMAD2XI5BEVP47EU4ATKA325DT6GMLKEZCIFRNAQOEYBZMV65BG2NMQMXXMF64SELFC3GQENHI36XC7CLTAUJHHFJMOPHJSCX2OLH4U5EY4IQXGLDA3FV4NYZ4H5VB22ET6FH4MVSOFIZQ55G2FLHYPYXVOA; TrackID=1mf59oL8bhGmxKafDNKtK22JkkYDkXGMo1VABMtz44qA8oGW9UhAFb8h3DZBTnuIgp0dSg__LhVrqqJuX8KS5bbC586eTUzJWySwYub-KHFk; RT="z=1&dm=jd.com&si=sllvqfyueoa&ss=kad76rqd&sl=1&tt=2j7&ld=2ld&nu=523036fe0adc4d1d1c4f7d2041182e30&cl=2ti&ul=2zg&hd=345"; __jda=65775340.1142616513.1573036516.1589794225.1589847656.47; __jdc=65775340; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTGTYZUYOQFYXTXYSCQ5GVJRT45A; _lvtc_=5TFKEGOEZU44DVDPA52HTHK4OY; __jdb=65775340.13.1142616513|47.1589847656; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXNYUIYEZDGSN67VOHBTFQQJDRUQ; thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE02091482565B22012A1D51578CE7194CEB78B89CA3CFD86C1A9AE70A53920E92CF983D4D30D82767D40192131AB0E7CF04237A084F30CBB85B6FD9674EE50973FE05B3771629DFABFB329E9D8773F9E69B36FD6A269FEA66A3F6064A82276602C6948B49996632560BB7BDC2D091D60080F1; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASY5MQ5HWUJ36YUXHCTCUT3V7JDPCBNYDPXFCM2ZMCS474KZ44S5F
+		`)
 	} else {
 		JdShopAPI = nil
 	}

From 4b476fdbb23b65733c67b38282d0c763df67f58e 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, 19 May 2020 09:13:25 +0800
Subject: [PATCH 126/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95jdscookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 globals/api/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index d68c84951..f91381b0d 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -124,7 +124,7 @@ func Init() {
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
 		JdShopAPI.SetCookieWithStr(`
-			shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIEY252TEDX4TNI26TYYNQKR53PLV4NA7VLZHCQSBGGXOUZA57E3KGVXVOW3S2PCV5UG6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEGWEACMF55RVZFQZRYUO4LVOJ2Q; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5P4YUR5KISNNHYQLAU4AT5AJH2MD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURZJPHE5NZCGUSHCIN2DSCCSUDOMZSJUMU5VPVFSYLMBPOGZARWRVZ2Z57ZZHGMS6C2W7LMPJ74WPXTF4QUQ23OH3RMQFVM4C4IFXK3FMAD2XI5BEVP47EU4ATKA325DT6GMLKEZCIFRNAQOEYBZMV65BG2NMQMXXMF64SELFC3GQENHI36XC7CLTAUJHHFJMOPHJSCX2OLH4U5EY4IQXGLDA3FV4NYZ4H5VB22ET6FH4MVSOFIZQ55G2FLHYPYXVOA; TrackID=1mf59oL8bhGmxKafDNKtK22JkkYDkXGMo1VABMtz44qA8oGW9UhAFb8h3DZBTnuIgp0dSg__LhVrqqJuX8KS5bbC586eTUzJWySwYub-KHFk; RT="z=1&dm=jd.com&si=sllvqfyueoa&ss=kad76rqd&sl=1&tt=2j7&ld=2ld&nu=523036fe0adc4d1d1c4f7d2041182e30&cl=2ti&ul=2zg&hd=345"; __jda=65775340.1142616513.1573036516.1589794225.1589847656.47; __jdc=65775340; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTGTYZUYOQFYXTXYSCQ5GVJRT45A; _lvtc_=5TFKEGOEZU44DVDPA52HTHK4OY; __jdb=65775340.13.1142616513|47.1589847656; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXNYUIYEZDGSN67VOHBTFQQJDRUQ; thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE02091482565B22012A1D51578CE7194CEB78B89CA3CFD86C1A9AE70A53920E92CF983D4D30D82767D40192131AB0E7CF04237A084F30CBB85B6FD9674EE50973FE05B3771629DFABFB329E9D8773F9E69B36FD6A269FEA66A3F6064A82276602C6948B49996632560BB7BDC2D091D60080F1; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASY5MQ5HWUJ36YUXHCTCUT3V7JDPCBNYDPXFCM2ZMCS474KZ44S5F
+		thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77;
 		`)
 	} else {
 		JdShopAPI = nil

From 9dcc7573750ecd22867fe8b15fab717e007e1367 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, 19 May 2020 09:15:55 +0800
Subject: [PATCH 127/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95jdscookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 globals/api/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index f91381b0d..d237fe084 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -124,7 +124,7 @@ func Init() {
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
 		JdShopAPI.SetCookieWithStr(`
-		thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77;
+		b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXD5Y5KD57Q6DNB7R2CIG73OJGRG;thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77;
 		`)
 	} else {
 		JdShopAPI = nil

From 0a31e1c65a12f4c833cb0fbc853f39968dc8b326 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, 19 May 2020 09:20:35 +0800
Subject: [PATCH 128/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95jdscookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 globals/api/api.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/globals/api/api.go b/globals/api/api.go
index d237fe084..ceb62b0ec 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -124,7 +124,7 @@ func Init() {
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
 		JdShopAPI.SetCookieWithStr(`
-		b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXD5Y5KD57Q6DNB7R2CIG73OJGRG;thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77;
+		shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; TrackID=1mf59oL8bhGmxKafDNKtK22JkkYDkXGMo1VABMtz44qA8oGW9UhAFb8h3DZBTnuIgp0dSg__LhVrqqJuX8KS5bbC586eTUzJWySwYub-KHFk; __jda=65775340.1142616513.1573036516.1589794225.1589847656.47; __jdc=65775340; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTMQ4VCGRVBWMCZ2FUHOJJTIPPFA; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE5CLSIPNZNG2ZCS5DKGDVSHWBED4NA7VLZHCQSBHIS4SD3OLJWWIUGFXN4VE3UQCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBFLC7GXULW4F4OAIXIIXDVKJSSHA; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXD5Y5KD57Q6DNB7R2CIG73OJGRG; thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77; __jdb=65775340.16.1142616513|47.1589847656; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASIMLUMHQBISMZEIJTQDQIXHES3PCBNYDPXFCM2ZMCS474KZ44S5F; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5M56XV3YQRPKMGF4V3KOC6WK77MT6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFLLGZJW2KICAT25RZ6SYLHTV5VSLZ3UAETQ2ROBEOKMBSQDORSYCY7TMNQN7X7NMZ; _lvtc_=XV4SC6RTJIDFE3LSNRB22LADHI	
 		`)
 	} else {
 		JdShopAPI = nil

From 73dce6619588f53f533e7f0d365fdd97d550e8d7 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, 19 May 2020 09:41:14 +0800
Subject: [PATCH 129/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95jdscookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 8 ++++----
 conf/app.conf                 | 8 +++++++-
 globals/api/api.go            | 3 ---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index f2c07494f..608b4521f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -292,9 +292,9 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
-	// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-	// 	jdsCookie = configs[0].Value
-	// }
+	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+		jdsCookie = configs[0].Value
+	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
@@ -315,7 +315,7 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	// api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/conf/app.conf b/conf/app.conf
index 2fa3e9fc4..b3f945bdd 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -31,7 +31,8 @@ enableEbaiStoreWrite = false
 enableElmStoreWrite = false
 enableMtwmStoreWrite = false
 enableWscStoreWrite = false
-enableYbStoreWrite = true
+enableYbStoreWrite = false
+enableJdShopWrite = false
 
 aliKey = "LTAI4FwZN7pp4dACQHoapkZQ"
 aliSecret = "NTegceUFX0FdfMovqCDzqcIKmhcoOu"
@@ -264,6 +265,7 @@ enableJdStoreWrite = true
 enableEbaiStoreWrite = true
 enableMtwmStoreWrite = true
 enableYbStoreWrite = true 
+enableJdShopWrite = true
 
 mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
 mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
@@ -307,6 +309,10 @@ jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
 jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
 jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 
+jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
+jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
+jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+
 storeName = "京西果园"
 
 [test]
diff --git a/globals/api/api.go b/globals/api/api.go
index ceb62b0ec..9fd4b40ec 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,9 +123,6 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
-		JdShopAPI.SetCookieWithStr(`
-		shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; TrackID=1mf59oL8bhGmxKafDNKtK22JkkYDkXGMo1VABMtz44qA8oGW9UhAFb8h3DZBTnuIgp0dSg__LhVrqqJuX8KS5bbC586eTUzJWySwYub-KHFk; __jda=65775340.1142616513.1573036516.1589794225.1589847656.47; __jdc=65775340; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTMQ4VCGRVBWMCZ2FUHOJJTIPPFA; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE5CLSIPNZNG2ZCS5DKGDVSHWBED4NA7VLZHCQSBHIS4SD3OLJWWIUGFXN4VE3UQCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBFLC7GXULW4F4OAIXIIXDVKJSSHA; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXD5Y5KD57Q6DNB7R2CIG73OJGRG; thor=80FAF09E9A09B6E618A68057BDFCFCB81804416EE1F5B89ACA22BA8D15BE0209A9B2004C89BBF4D37E2794B8639C730A6C3DD2DABF70F335A315D213AB777D8A7CABA3E1E8E6B50EFEA4203B9412129FB78E3FE1A45ACE35917D1C51C10621921038267C820748715A922BDEE1C770DA7949098A5236B87921DDBBA824383A6E9A740F3E03BBB53F8E137495D70CCE77; __jdb=65775340.16.1142616513|47.1589847656; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASIMLUMHQBISMZEIJTQDQIXHES3PCBNYDPXFCM2ZMCS474KZ44S5F; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5M56XV3YQRPKMGF4V3KOC6WK77MT6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFLLGZJW2KICAT25RZ6SYLHTV5VSLZ3UAETQ2ROBEOKMBSQDORSYCY7TMNQN7X7NMZ; _lvtc_=XV4SC6RTJIDFE3LSNRB22LADHI	
-		`)
 	} else {
 		JdShopAPI = nil
 	}

From 4b5191fa6237403a496ff5d6f6955239809487fd 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, 19 May 2020 10:15:47 +0800
Subject: [PATCH 130/285] =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go           |  2 +-
 business/partner/purchase/ebai/store.go |  8 ++-
 business/partner/purchase/jd/store.go   | 10 +++-
 business/partner/purchase/mtwm/store.go |  8 ++-
 conf/app.conf                           | 70 -------------------------
 5 files changed, 23 insertions(+), 75 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 608b4521f..d5d80df95 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -294,6 +294,7 @@ func Init() {
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
 		jdsCookie = configs[0].Value
+		api.JdShopAPI.SetCookieWithStr(jdsCookie)
 	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
@@ -315,7 +316,6 @@ func Init() {
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName, JdStorePageCookie)
 	api.JdPageAPI.SetCookie(jdapi.AccessStorePageCookieName2, JdStorePageCookie)
 	api.FeieAPI.SetCookieWithStr(feiePageCookie)
-	api.JdShopAPI.SetCookieWithStr(jdsCookie)
 }
 
 func syncStoreSku() {
diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go
index 2ec56b65e..4ae71f077 100644
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -383,7 +383,13 @@ func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
 	// 	// params["phone"] = tel     // 外卖客服联系电话，这个有时能修改，有时不能修改，暂时统一不改
 	// 	params["ivr_phone"] = tel // 订单提醒电话
 	// }
-	params["ivr_phone"] = model.VendorStoreTel //统一改为这个电话
+	phone := ""
+	if store.MarketManPhone != "" {
+		phone = store.MarketManPhone
+	} else {
+		phone = model.VendorStoreTel
+	}
+	params["ivr_phone"] = phone //统一改为这个电话
 	if store.VendorStoreID != "" {
 		params["baidu_shop_id"] = store.VendorStoreID
 	}
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 29a237575..c46398f62 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -138,11 +138,17 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err = dao.GetRows(db, &stores, sql, model.VendorIDJD, utils.DefaultTimeValue, storeID); err == nil {
 		for _, store := range stores {
 			a := getAPI(store.VendorOrgCode)
+			phone := ""
+			if store.MarketManPhone != "" {
+				phone = store.MarketManPhone
+			} else {
+				phone = model.VendorStoreTel
+			}
 			storeParams := &jdapi.OpStoreParams{
 				StationNo: store.VendorStoreID,
 				Operator:  userName,
-				Phone:     model.VendorStoreTel,
-				Mobile:    store.Tel1,
+				Phone:     phone,
+				Mobile:    store.Tel2,
 			}
 			if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
 				storeParams.OutSystemID = utils.Int2Str(int(store.ID))
diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index 55768ce47..8ffdd3060 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -130,12 +130,18 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		// }
 	}
 	// openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus)
+	phone := ""
+	if storeDetail.MarketManPhone != "" {
+		phone = storeDetail.MarketManPhone
+	} else {
+		phone = model.VendorStoreTel
+	}
 	params := map[string]interface{}{
 		"name":           name,                //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
 		"address":        storeDetail.Address, // 美团好像地址也不能改的?
 		"longitude":      jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Longitude)),
 		"latitude":       jxutils.IntCoordinate2Standard(int(remoteStoreInfo.Latitude)),
-		"phone":          model.VendorStoreTel,
+		"phone":          phone,
 		"shipping_fee":   remoteStoreInfo.ShippingFee,
 		"shipping_time":  remoteStoreInfo.ShippingTime,
 		"open_level":     remoteStoreInfo.OpenLevel,
diff --git a/conf/app.conf b/conf/app.conf
index b3f945bdd..88faf6c0b 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -443,73 +443,3 @@ yinbaoAppKey = "682628966212343269"
 yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4"
 
 aliUpcAppCode = "00a6eefba0204d3fa310ac0ee7a6fc54"
-
-[prod3]
-EnableDocs = false
-
-jdOrgCode = "320406"
-jdToken  = "77e703b7-7997-441b-a12a-2e522efb117a"
-jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
-jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
-
-jd2OrgCode = "349454"
-jd2Token  = "29e0e567-c475-433a-aff0-37176ee8d8a7"
-jd2AppKey = "7fb947624ff847ae94ff2f068cc99652"
-jd2Secret = "1097abd7ef09427099b4922784af123a"
-
-jdEclpAccessToken = "bcb6201b5b3c45a0976dcda5e2dea8aejiwm"
-jdEclpAppKey = "0D397F05CF11C51BCDCC81744680EBC3"
-jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
-
-elmIsProd = true
-elmToken  = ""
-elmAppKey = "KLRDcOZGrk"
-elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
-
-ebaiSource = "34665"
-ebaiSecret = "c3db75b754ea2d89"
-
-mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
-mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
-
-dadaIsProd      = true
-dadaCallbackURL = "http://callback.jxc4.com/dadadelivery/msg"
-dadaSourceID    = "6660"
-
-weixinAppID  = "wx2bb99eb5d2c9b82c"
-weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
-weixinMiniAppID2  = "wx4b5930c13f8b1170"
-weixinMiniSecret2 = "2a57228a716ce991a52739f0ff41111d"
-
-yinbaoAppKey = "682628966212343269"
-yinbaoAppID = "18C0E0867E467DBC26EFF5E957B02EC4"
-
-aliUpcAppCode = "00a6eefba0204d3fa310ac0ee7a6fc54"
-
-wxpayNotifyURL = "http://callback.jxc4.com/wxpay/msg/"
-
-tonglianPayAppID = "00183083"
-tonglianPayKey = "18048531223"
-tonglianPayCusID = "56065105499TVAH"
-tonglianPayNotifyURL = "http://callback.jxc4.com/tonglian/msg/"
-
-dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
-
-enableStoreWrite = false
-enableJdStoreWrite = false
-enableEbaiStoreWrite = false
-enableMtwmStoreWrite = false
-enableWscStoreWrite = false
-enableYbStoreWrite = false 
-
-disableWeimob = false
-weimobCallbackURL = "http://callback.jxc4.com/weimob"
-
-dingdingAgentID = 733555444
-dingdingAppKey = "dingrn2ujlpa4ler2x4d"
-dingdingSecret = "I4ZC1BH1_xwpE_NaXeYZkWgCIfbp39rne9JYObmdN3NINetA6ghf-a4jQ9YXa2n7"
-
-dingdingQRCodeAppKey = "dingoacnwcbkbwhktccmmg"
-dingdingQRCodeSecret = "qizpI-k5a_5O9q7XVGRiqB4RDvbZ5qBTCzlxDVZwYxRQoyJoeg6LLrORDFLoLChc"
-
-dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg"
\ No newline at end of file

From 15fa328726028cbb7cea4042b9432dcf2f85d770 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, 19 May 2020 10:57:21 +0800
Subject: [PATCH 131/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 24 ++++++++++++++++++++++++
 controllers/jx_order.go               | 14 ++++++++++++++
 routers/commentsRouter_controllers.go |  9 +++++++++
 3 files changed, 47 insertions(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 6848b520c..f951763b6 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -962,3 +962,27 @@ func RefreshOrdersPriceInfo(ctx *jxcontext.Context, fromTime, toTime time.Time,
 	}
 	return hint, err
 }
+
+type GetOrderSimpleInfoResult struct {
+	VendorOrderID   string `orm:"column(vendor_order_id)" json:"vendorOrderID"`
+	Status          int    `json:"status"`
+	WaybillVendorID int    `orm:"column(waybill_vendor_id)" json:"waybillVendorID"`
+	CourierName     string `json:"courierName"`
+	CourierMobile   string `json:"courierMobile"`
+	Tel1            string `json:"tel1"`
+	MarketManPhone  string `json:"marketManPhone"`
+}
+
+func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderSimpleInfoResult *GetOrderSimpleInfoResult, err error) {
+	db := dao.GetDB()
+	sql := `
+		SELECT a.vendor_order_id, a.status, b.waybill_vendor_id, b.courier_name, b.courier_mobile, b.tel1, b.market_man_phone
+		FROM goods_order a
+		JOIN store b ON IF(a.store_id <> '', a.store_id, a.jx_store_id) = b.id 
+		LEFT JOIN waybill c ON c.vendor_order_id = a.vendor_order_id 
+		WHERE a.vendor_order_id = ?
+	`
+	sqlParams := []interface{}{vendorOrderID}
+	err = dao.GetRow(db, &getOrderSimpleInfoResult, sql, sqlParams)
+	return getOrderSimpleInfoResult, err
+}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index bb01fc5cd..7cdef0c65 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1031,3 +1031,17 @@ func (c *OrderController) RefreshJdShopOrdersEarningPrice() {
 		return retVal, "", err
 	})
 }
+
+// @Title 根据订单号查询一些信息
+// @Description 根据订单号查询一些信息
+// @Param	token			header		string	false	"认证token"
+// @Param	vendorOrderID	query		string	true	"订单号"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetOrderSimpleInfo [get]
+func (c *OrderController) GetOrderSimpleInfo() {
+	c.callGetOrderSimpleInfo(func(params *tOrderGetOrderSimpleInfoParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = orderman.GetOrderSimpleInfo(params.Ctx, params.VendorOrderID)
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 69e4aa67d..1250ecf20 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1017,6 +1017,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "GetOrderSimpleInfo",
+            Router: `/GetOrderSimpleInfo`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "GetOrderSkuInfo",

From 5232001cd07bd0f9714d448615d27f93f87891de 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, 19 May 2020 10:58:51 +0800
Subject: [PATCH 132/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=80=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index f951763b6..16eadfffb 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -984,5 +984,6 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 	`
 	sqlParams := []interface{}{vendorOrderID}
 	err = dao.GetRow(db, &getOrderSimpleInfoResult, sql, sqlParams)
+
 	return getOrderSimpleInfoResult, err
 }

From 49403d559d2ed23508898a11e78b358c0ce0746c 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, 19 May 2020 11:11:34 +0800
Subject: [PATCH 133/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 16eadfffb..d34c153fe 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -976,7 +976,7 @@ type GetOrderSimpleInfoResult struct {
 func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderSimpleInfoResult *GetOrderSimpleInfoResult, err error) {
 	db := dao.GetDB()
 	sql := `
-		SELECT a.vendor_order_id, a.status, b.waybill_vendor_id, b.courier_name, b.courier_mobile, b.tel1, b.market_man_phone
+		SELECT a.vendor_order_id, a.status, c.waybill_vendor_id, c.courier_name, c.courier_mobile, b.tel1, b.market_man_phone
 		FROM goods_order a
 		JOIN store b ON IF(a.store_id <> '', a.store_id, a.jx_store_id) = b.id 
 		LEFT JOIN waybill c ON c.vendor_order_id = a.vendor_order_id 
@@ -984,6 +984,8 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 	`
 	sqlParams := []interface{}{vendorOrderID}
 	err = dao.GetRow(db, &getOrderSimpleInfoResult, sql, sqlParams)
-
+	if getOrderSimpleInfoResult == nil {
+		return getOrderSimpleInfoResult, fmt.Errorf("未查询到该订单的信息！订单号：[%v]", vendorOrderID)
+	}
 	return getOrderSimpleInfoResult, err
 }

From fe782dabafe5811226b4e7046b6dbcebc8983707 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, 19 May 2020 14:58:01 +0800
Subject: [PATCH 134/285] =?UTF-8?q?=E7=BB=99=E5=AE=A2=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E5=91=98=E5=8F=91=E7=9F=AD=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     |  7 ++
 business/jxstore/cms/user2.go                 | 15 +++
 business/jxstore/misc/misc.go                 |  3 +
 business/jxutils/smsmsg/smsmsg.go             | 94 ++++++++++++++++++-
 business/model/dao/dao_user.go                | 19 ++++
 business/model/user.go                        | 19 ++++
 conf/app.conf                                 |  1 +
 globals/beegodb/beegodb.go                    |  1 +
 globals/globals.go                            |  2 +
 9 files changed, 160 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index fdb6c32d6..750a63555 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -516,6 +516,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				s.resetTimer(savedOrderInfo, bill, isPending)
 				s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
 			}
+			s.sendCourierOrderSMS(bill)
 		} else {
 			isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
 			if !isBillExist {
@@ -654,6 +655,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 	return err
 }
 
+func (s *DefScheduler) sendCourierOrderSMS(bill *model.Waybill) (err error) {
+	err = smsmsg.NotifyNewCourierOrder(bill)
+	return err
+}
+
 func (s *DefScheduler) isWaybillCourierSame(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool {
 	return savedOrderInfo.waybills[bill.WaybillVendorID] != nil && savedOrderInfo.waybills[bill.WaybillVendorID].CourierMobile == bill.CourierMobile
 }
@@ -1355,6 +1361,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 			weixinmsg.NotifyNewOrder(order)
 			smsmsg.NotifyNewOrder(order)
 			OrderProfitWarning(order)
+			smsmsg.NotifyNewUserOrder(order)
 		})
 	}
 }
diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 7601e08dd..6fdc80348 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -1109,3 +1109,18 @@ func GetUserAgreement(ctx *jxcontext.Context, name, idNumber, bankNumber, mobile
 	userAgrs, err = dao.GetUserAgreement(db, name, idNumber, bankNumber, mobile)
 	return userAgrs, err
 }
+
+func CleanUserOrderSMSMark(ctx *jxcontext.Context) (err error) {
+	var (
+		db = dao.GetDB()
+	)
+	if time.Now().Day() == 1 {
+		sql := `
+		UPDATE user_order_sms 
+		   SET sms_mark = ?
+	`
+		sqlParams := []interface{}{model.NO}
+		_, err = dao.ExecuteSQL(db, sql, sqlParams)
+	}
+	return err
+}
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index d5d80df95..187bfbfb4 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -219,6 +219,9 @@ func Init() {
 		ScheduleTimerFunc("CleanStoreIsBoughtMatter", func() {
 			cms.CleanStoreIsBoughtMatter(jxcontext.AdminCtx)
 		}, priceReferTimeList)
+		ScheduleTimerFunc("CleanUserOrderSMSMark", func() {
+			cms.CleanUserOrderSMSMark(jxcontext.AdminCtx)
+		}, priceReferTimeList)
 		ScheduleTimerFunc("exSync", func() {
 			var (
 				db                = dao.GetDB()
diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 819fbe44a..1e0d2f089 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -43,7 +43,9 @@ func SendSMSMsg(mobileList []string, signName, templateCode string, templatePara
 							globals.SugarLogger.Infof(errMsg)
 						}
 					} else {
-						err = updateStoreSMSNotifyMark(order)
+						if order != nil {
+							err = updateStoreSMSNotifyMark(order)
+						}
 					}
 				}
 			}
@@ -99,3 +101,93 @@ func updateStoreSMSNotifyMark(order *model.GoodsOrder) (err error) {
 	}
 	return err
 }
+
+//每月向用户发送
+func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
+	var (
+		db       = dao.GetDB()
+		storeTel string
+		storeID  int
+		mobile   string
+	)
+	if order.StoreID == 0 {
+		storeID = order.JxStoreID
+	} else {
+		storeID = order.StoreID
+	}
+	if order.ConsigneeMobile2 == "" {
+		mobile = order.ConsigneeMobile
+	} else {
+		mobile = order.ConsigneeMobile2
+	}
+	uoSMS, err := dao.GetUserOrderSMS(db, mobile, "")
+	stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
+	if len(stores) > 0 {
+		if stores[0].Tel1 == "" {
+			storeTel = stores[0].Tel2
+		} else {
+			storeTel = stores[0].Tel1
+		}
+	}
+	if uoSMS == nil {
+		uoSMSc := model.UserOrderSms{
+			Mobile:       mobile,
+			Name:         order.ConsigneeName,
+			VendorUserID: order.VendorUserID,
+			TotalCount:   0,
+			SMSMark:      model.NO,
+		}
+		err = dao.CreateEntity(db, uoSMSc)
+		if uoSMS.SMSMark != model.YES {
+			err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+				"tel": storeTel,
+			}, nil)
+			if err == nil {
+				uoSMS.SMSMark = model.YES
+				uoSMS.TotalCount++
+				_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
+			}
+		}
+	} else {
+		if uoSMS.SMSMark != model.YES {
+			err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+				"tel": storeTel,
+			}, nil)
+			if err == nil {
+				uoSMS.SMSMark = model.YES
+				uoSMS.TotalCount++
+				_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
+			}
+		}
+	}
+	return err
+}
+
+//给配送员发短信
+func NotifyNewCourierOrder(bill *model.Waybill) (err error) {
+	var (
+		db       = dao.GetDB()
+		storeTel string
+		storeID  int
+	)
+	order := &model.GoodsOrder{}
+	order.VendorOrderID = bill.VendorOrderID
+	err = dao.GetEntity(db, order, "VendorOrderID")
+	if order.StoreID == 0 {
+		storeID = order.JxStoreID
+	} else {
+		storeID = order.StoreID
+	}
+	stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
+	if len(stores) > 0 {
+		if stores[0].Tel1 == "" {
+			storeTel = stores[0].Tel2
+		} else {
+			storeTel = stores[0].Tel1
+		}
+	}
+	err = SendSMSMsg([]string{bill.CourierMobile}, globals.SMSSignName, globals.SMSNewOrderTemplate, map[string]interface{}{
+		"tel": storeTel,
+	}, nil)
+	return err
+}
diff --git a/business/model/dao/dao_user.go b/business/model/dao/dao_user.go
index 4e73d14ca..4206a2979 100644
--- a/business/model/dao/dao_user.go
+++ b/business/model/dao/dao_user.go
@@ -239,3 +239,22 @@ func GetUserAgreement(db *DaoDB, name, idNumber, bankNumber, mobile string) (use
 	err = GetRows(db, &userAgrs, sql, sqlParams)
 	return userAgrs, err
 }
+
+func GetUserOrderSMS(db *DaoDB, mobile, name string) (userOrderSms *model.UserOrderSms, err error) {
+	sql := `
+		SELECT * 
+		  FROM user_order_sms
+		 WHERE 1=1 
+	`
+	sqlParams := []interface{}{}
+	if mobile != "" {
+		sql += " AND mobile = ?"
+		sqlParams = append(sqlParams, mobile)
+	}
+	if name != "" {
+		sql += " AND name like ?"
+		sqlParams = append(sqlParams, "%"+name+"%")
+	}
+	err = GetRow(db, &userOrderSms, sql, sqlParams)
+	return userOrderSms, err
+}
diff --git a/business/model/user.go b/business/model/user.go
index d7718c2a8..91011fbbf 100644
--- a/business/model/user.go
+++ b/business/model/user.go
@@ -175,3 +175,22 @@ type UserAgreement struct {
 	IDNumber   string `orm:"column(id_number);size(20)" json:"idNumber"`
 	BankNumber string `orm:"size(32)" json:"bankNumber"`
 }
+
+type UserOrderSms struct {
+	ID           int64     `orm:"column(id)" json:"-"`
+	CreatedAt    time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"`
+	UpdatedAt    time.Time `orm:"auto_now;type(datetime)" json:"-"`
+	LastOperator string    `orm:"size(32)" json:"-"` // 最后操作员
+
+	Mobile       string `orm:"size(32)" json:"mobile"`
+	Name         string `orm:"size(32)" json:"name"`
+	VendorUserID string `orm:"column(vendor_user_id)" json:"vendorUserID"`
+	SMSMark      int    `orm:"column(sms_mark)" json:"smsMark"`
+	TotalCount   int    `json:"totalCount"`
+}
+
+func (*UserOrderSms) TableUnique() [][]string {
+	return [][]string{
+		[]string{"Mobile"},
+	}
+}
diff --git a/conf/app.conf b/conf/app.conf
index 88faf6c0b..8229f4d5a 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -126,6 +126,7 @@ smsSignName = "京西菜市"
 smsMobileVerifyTemplate = "SMS_175583158"
 smsNewOrderTemplate = "SMS_175583150"
 smsOrderCanceledTemplate = "SMS_175573134"
+smsNewUserOrderTemplate = "SMS_190283955"
 
 addEvent = true
 
diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go
index 284fe4195..a7b8caf44 100644
--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -74,6 +74,7 @@ func Init() {
 	orm.RegisterModel(&model.UserCartItem{})
 	orm.RegisterModel(&model.UserAgreement{})
 	orm.RegisterModel(&model.OrderPay{}, &model.OrderPayRefund{})
+	orm.RegisterModel(&model.UserOrderSms{})
 
 	orm.RegisterModel(&model.FakeJdThingMap{})
 
diff --git a/globals/globals.go b/globals/globals.go
index 6447c9fad..022333e7b 100644
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -48,6 +48,7 @@ var (
 	SMSMobileVerifyTemplate  string
 	SMSNewOrderTemplate      string
 	SMSOrderCanceledTemplate string
+	SMSNewUserOrderTemplate  string
 
 	EnableWXAuth2  bool
 	DisableWXAuth1 bool
@@ -119,6 +120,7 @@ func Init() {
 	SMSMobileVerifyTemplate = beego.AppConfig.String("smsMobileVerifyTemplate")
 	SMSNewOrderTemplate = beego.AppConfig.String("smsNewOrderTemplate")
 	SMSOrderCanceledTemplate = beego.AppConfig.String("smsOrderCanceledTemplate")
+	SMSNewUserOrderTemplate = beego.AppConfig.String("smsNewUserOrderTemplate")
 
 	EnableWXAuth2 = true // beego.BConfig.RunMode == "beta"
 	DisableWXAuth1 = true

From a0dd56c84ab5773e07cb8bcac253c519c4ad2749 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, 19 May 2020 15:23:08 +0800
Subject: [PATCH 135/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 033f06c74..2dd2edce6 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -65,23 +65,32 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			// skuName := &model.SkuName{}
-			// skuName.ID = v.NameID
-			// db := dao.GetDB()
-			// if err = dao.GetEntity(db, skuName); err != nil {
-			// 	return failedList, err
-			// }
-			// payload := map[string]interface{}{
-			// 	"name": v.Name,
-			// }
-			// valid := dao.StrictMakeMapByStructObject(payload, skuName, ctx.GetUserName())
 			name := filterSensitiveWord(v.Name)
 			updateWareParam := &jdshopapi.UpdateWareParam{
 				WareID:    v.JdsWareID,
 				Title:     name,
 				VenderID:  jdshopapi.VenderID,
 				PromiseID: jdshopapi.JdsPromiseID,
-				// Weight: v.Weight,
+			}
+			var desc string
+			if v.DescImg != "" {
+				pic3, err2 := uploadImg(v.DescImg, name, "desc")
+				err = err2
+				desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+			}
+			updateWareParam.Introduction = desc
+			updateWareParam.MobileDesc = desc
+			if v.Img != "" {
+				pic1, err2 := uploadImg(v.Img, name, "1")
+				err = err2
+				err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 1, pic1)
+				if v.Img2 != "" {
+					pic2, err2 := uploadImg(v.Img2, name, "2")
+					err = err2
+					err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 2, pic2)
+				} else {
+					err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 2, pic1)
+				}
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 		}

From 96bbd3976e5e5d2962a8f1dffc4f62f7d2ecaa8b 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, 19 May 2020 15:24:49 +0800
Subject: [PATCH 136/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 2dd2edce6..09501d8f7 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -91,6 +91,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				} else {
 					err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 2, pic1)
 				}
+
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 		}

From b5c9ff6fdd2e508fb3013581dbd986772f8e1e14 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, 19 May 2020 15:31:58 +0800
Subject: [PATCH 137/285] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/smsmsg/smsmsg.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 1e0d2f089..3881830dc 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -130,7 +130,7 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 		}
 	}
 	if uoSMS == nil {
-		uoSMSc := model.UserOrderSms{
+		uoSMSc := &model.UserOrderSms{
 			Mobile:       mobile,
 			Name:         order.ConsigneeName,
 			VendorUserID: order.VendorUserID,

From 9462a301ccab9d27c4db688d484e3cf3b4c60ff7 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, 19 May 2020 15:36:44 +0800
Subject: [PATCH 138/285] =?UTF-8?q?=E5=85=88=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 750a63555..54bfb0b65 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -516,7 +516,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				s.resetTimer(savedOrderInfo, bill, isPending)
 				s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
 			}
-			s.sendCourierOrderSMS(bill)
+			// s.sendCourierOrderSMS(bill)
 		} else {
 			isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
 			if !isBillExist {
@@ -1361,7 +1361,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 			weixinmsg.NotifyNewOrder(order)
 			smsmsg.NotifyNewOrder(order)
 			OrderProfitWarning(order)
-			smsmsg.NotifyNewUserOrder(order)
+			// smsmsg.NotifyNewUserOrder(order)
 		})
 	}
 }

From 21730fd353ef88c7656f50ad87d1f380ae35d00a 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, 19 May 2020 15:42:03 +0800
Subject: [PATCH 139/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index d34c153fe..89d12342d 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -976,7 +976,7 @@ type GetOrderSimpleInfoResult struct {
 func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderSimpleInfoResult *GetOrderSimpleInfoResult, err error) {
 	db := dao.GetDB()
 	sql := `
-		SELECT a.vendor_order_id, a.status, c.waybill_vendor_id, c.courier_name, c.courier_mobile, b.tel1, b.market_man_phone
+		SELECT a.vendor_order_id, a.status, a.waybill_vendor_id, c.courier_name, c.courier_mobile, b.tel1, b.market_man_phone
 		FROM goods_order a
 		JOIN store b ON IF(a.store_id <> '', a.store_id, a.jx_store_id) = b.id 
 		LEFT JOIN waybill c ON c.vendor_order_id = a.vendor_order_id 

From 1d9c32f3bcab272bd9eff3688f5a5a3778834345 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, 19 May 2020 15:43:27 +0800
Subject: [PATCH 140/285] =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/smsmsg/smsmsg.go | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 3881830dc..48af40671 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -138,15 +138,13 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 			SMSMark:      model.NO,
 		}
 		err = dao.CreateEntity(db, uoSMSc)
-		if uoSMS.SMSMark != model.YES {
-			err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
-				"tel": storeTel,
-			}, nil)
-			if err == nil {
-				uoSMS.SMSMark = model.YES
-				uoSMS.TotalCount++
-				_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
-			}
+		err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+			"tel": storeTel,
+		}, nil)
+		if err == nil {
+			uoSMS.SMSMark = model.YES
+			uoSMS.TotalCount++
+			_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
 		}
 	} else {
 		if uoSMS.SMSMark != model.YES {

From 6c352c9cf1952a5d2eeaab7386e4915fc7fe3b5c 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, 19 May 2020 15:51:32 +0800
Subject: [PATCH 141/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 89d12342d..a791b329b 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -985,7 +985,7 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 	sqlParams := []interface{}{vendorOrderID}
 	err = dao.GetRow(db, &getOrderSimpleInfoResult, sql, sqlParams)
 	if getOrderSimpleInfoResult == nil {
-		return getOrderSimpleInfoResult, fmt.Errorf("未查询到该订单的信息！订单号：[%v]", vendorOrderID)
+		return getOrderSimpleInfoResult, fmt.Errorf("未查询到该订单的信息！")
 	}
 	return getOrderSimpleInfoResult, err
 }

From 93a7acc6417898e4a543c10b62effa4078cd17c0 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, 19 May 2020 15:52:28 +0800
Subject: [PATCH 142/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index a791b329b..8721db7a8 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -987,5 +987,6 @@ func GetOrderSimpleInfo(ctx *jxcontext.Context, vendorOrderID string) (getOrderS
 	if getOrderSimpleInfoResult == nil {
 		return getOrderSimpleInfoResult, fmt.Errorf("未查询到该订单的信息！")
 	}
+
 	return getOrderSimpleInfoResult, err
 }

From 65b81f93e0390b9bdbb7ce693f815dc6edc69ece 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, 19 May 2020 15:59:45 +0800
Subject: [PATCH 143/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 09501d8f7..74e4b844a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -74,18 +74,18 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			}
 			var desc string
 			if v.DescImg != "" {
-				pic3, err2 := uploadImg(v.DescImg, name, "desc")
+				pic3, err2 := uploadImg2(v.DescImg, name, "desc")
 				err = err2
 				desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
 			}
 			updateWareParam.Introduction = desc
 			updateWareParam.MobileDesc = desc
 			if v.Img != "" {
-				pic1, err2 := uploadImg(v.Img, name, "1")
+				pic1, err2 := uploadImg2(v.Img, name, "1")
 				err = err2
 				err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 1, pic1)
 				if v.Img2 != "" {
-					pic2, err2 := uploadImg(v.Img2, name, "2")
+					pic2, err2 := uploadImg2(v.Img2, name, "2")
 					err = err2
 					err = api.JdShopAPI.ImageUpdate(v.JdsWareID, 2, pic2)
 				} else {
@@ -512,6 +512,19 @@ func uploadImg(img, name, index string) (imgURL string, err error) {
 	return imgURL, err
 }
 
+func uploadImg2(img, name, index string) (imgURL string, err error) {
+	data, _, err := jxutils.DownloadFileByURL(img)
+	if err != nil {
+		return imgURL, err
+	}
+	uploadResult, err := api.JdShopAPI.UploadPicture(data, 0, name+index)
+	if err != nil {
+		return imgURL, err
+	}
+	imgURL = uploadResult.PictureURL
+	return imgURL, err
+}
+
 func filterSensitiveWord(name string) (result string) {
 	for _, v := range jdshopapi.SensitiveWordMap {
 		if strings.Contains(name, v) {

From fd447cb53ba4358a82d943c332416f90279ed869 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, 19 May 2020 16:10:33 +0800
Subject: [PATCH 144/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 89 ++++++++-----------------------
 1 file changed, 21 insertions(+), 68 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index bd170cf6f..b9e6b00d2 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
+
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1498,76 +1500,27 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	db := dao.GetDB()
-	result1, _ := api.JdShopAPI.GetProvince()
-	for _, v := range result1 {
-		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-		place1.JdsCode = v.AreaID
-		dao.UpdateEntity(db, place1, "JdsCode")
-		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-		for _, vv := range result2 {
-			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-			place2.JdsCode = vv.AreaID
-			dao.UpdateEntity(db, place2, "JdsCode")
-			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-			for _, vvv := range result3 {
-				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-				place3.JdsCode = vvv.AreaID
-				dao.UpdateEntity(db, place3, "JdsCode")
-			}
-		}
-	}
-	// var (
-	// 	skuNames []*model.SkuName
-	// 	db       = dao.GetDB()
-	// )
-	// sql := `
-	//  	SELECT DISTINCT a.*
-	//  	FROM sku_name a, store_sku_bind b, sku c
-	//  	WHERE a.id = c.name_id AND c.id = b.sku_id
-	//  	AND a.deleted_at = ? AND a.status = 1 AND a.img <> ''
-	//  	AND c.deleted_at = ? AND b.deleted_at = ?
-	//  	AND b.store_id = ?
-	// `
-	// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, 102919}
-	// err = dao.GetRows(dao.GetDB(), &skuNames, sql, sqlParams)
-	// for _, v := range skuNames {
-	// 	if v.ID == 9169 {
-	// 		for _, vv := range []string{v.Img, v.Img2, v.DescImg} {
-	// 			if vv == "" {
-	// 				continue
-	// 			}
-
-	// 			datar := &model.DataResource{
-	// 				MainURL: vv,
-	// 			}
-	// 			err = dao.GetEntity(db, datar, "MainURL")
-	// 			resBinary, hashCode, _ := jxutils.DownloadFileByURL(vv)
-	// 			handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop)
-	// 			img, err := handler.UploadImg(ctx, "", "", resBinary, v.Name, 1)
-	// 			if dao.IsNoRowsError(err) {
-	// 				dataRes := &model.DataResource{
-	// 					HashCode:     hashCode,
-	// 					ResourceType: http.DetectContentType(resBinary),
-	// 					MainURL:      vv,
-	// 					JdsURL:       img,
-	// 				}
-	// 				if vv == v.DescImg {
-	// 					dataRes.Name = v.Name + "_desc"
-	// 					dataRes.UseType = model.ImgTypeDesc
-	// 				} else {
-	// 					dataRes.UseType = model.ImgTypeMain
-	// 					dataRes.Name = v.Name
-	// 				}
-	// 				dao.CreateEntity(db, dataRes)
-	// 			} else {
-	// 				if err == nil {
-	// 					datar.JdsURL = img
-	// 					dao.UpdateEntity(db, datar, "JdsURL")
-	// 				}
-	// 			}
+	// db := dao.GetDB()
+	// result1, _ := api.JdShopAPI.GetProvince()
+	// for _, v := range result1 {
+	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+	// 	place1.JdsCode = v.AreaID
+	// 	dao.UpdateEntity(db, place1, "JdsCode")
+	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+	// 	for _, vv := range result2 {
+	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+	// 		place2.JdsCode = vv.AreaID
+	// 		dao.UpdateEntity(db, place2, "JdsCode")
+	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+	// 		for _, vvv := range result3 {
+	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+	// 			place3.JdsCode = vvv.AreaID
+	// 			dao.UpdateEntity(db, place3, "JdsCode")
 	// 		}
 	// 	}
 	// }
+	err = smsmsg.SendSMSMsg([]string{"17096577102,531"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+		"tel": "123",
+	}, nil)
 	return err
 }

From 8a5e909df328af0e18f1a31775f15058ed60c0c1 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, 19 May 2020 16:16:31 +0800
Subject: [PATCH 145/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index b9e6b00d2..ac8fed716 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1519,7 +1519,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		}
 	// 	}
 	// }
-	err = smsmsg.SendSMSMsg([]string{"17096577102,531"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+	err = smsmsg.SendSMSMsg([]string{"18160030913"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
 		"tel": "123",
 	}, nil)
 	return err

From d5f9c84d0795bc3c49d6673c0523a3cb5816823c 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, 19 May 2020 16:17:58 +0800
Subject: [PATCH 146/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index ac8fed716..1e680f2b2 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1522,5 +1522,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	err = smsmsg.SendSMSMsg([]string{"18160030913"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
 		"tel": "123",
 	}, nil)
+
 	return err
 }

From cf735634cc6509ae0ec92c561a56f1f30cfda6e2 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, 19 May 2020 16:23:57 +0800
Subject: [PATCH 147/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/app.conf b/conf/app.conf
index 8229f4d5a..ab82ff91a 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -126,7 +126,7 @@ smsSignName = "京西菜市"
 smsMobileVerifyTemplate = "SMS_175583158"
 smsNewOrderTemplate = "SMS_175583150"
 smsOrderCanceledTemplate = "SMS_175573134"
-smsNewUserOrderTemplate = "SMS_190283955"
+smsNewUserOrderTemplate = "SMS_190284055"
 
 addEvent = true
 

From fd8aee31ba5cc4bfd1b057451c192bf0d928fb19 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, 19 May 2020 17:02:50 +0800
Subject: [PATCH 148/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8F=91=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go       | 5 +++++
 business/jxstore/tempop/tempop.go | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 2a5f6aaf5..7e20ff16e 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1120,6 +1120,11 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 			err = ErrEntityNotExist
 		}
 	}
+	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
+	if len(storeSkus) > 0 {
+		skuBindInfos := []*StoreSkuBindInfo{}
+		FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
+	}
 	return outSkuNameExt, err
 }
 
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 1e680f2b2..ea0472d24 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1519,7 +1519,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		}
 	// 	}
 	// }
-	err = smsmsg.SendSMSMsg([]string{"18160030913"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+	err = smsmsg.SendSMSMsg([]string{"17096577102,531"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
 		"tel": "123",
 	}, nil)
 

From 916e71bae7e6d74c2d9f30139bbed72ec3f97c3d 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, 19 May 2020 17:14:38 +0800
Subject: [PATCH 149/285] =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E5=BC=80?=
 =?UTF-8?q?=E7=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     |  4 +-
 business/jxstore/cms/sku.go                   | 24 ++++++--
 business/jxutils/smsmsg/smsmsg.go             | 60 +++++++++----------
 3 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 54bfb0b65..750a63555 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -516,7 +516,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				s.resetTimer(savedOrderInfo, bill, isPending)
 				s.saveDeliveryFeeFromAndStartWatch(savedOrderInfo, bill.StatusTime)
 			}
-			// s.sendCourierOrderSMS(bill)
+			s.sendCourierOrderSMS(bill)
 		} else {
 			isBillExist := s.updateBillsInfo(savedOrderInfo, bill)
 			if !isBillExist {
@@ -1361,7 +1361,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 			weixinmsg.NotifyNewOrder(order)
 			smsmsg.NotifyNewOrder(order)
 			OrderProfitWarning(order)
-			// smsmsg.NotifyNewUserOrder(order)
+			smsmsg.NotifyNewUserOrder(order)
 		})
 	}
 }
diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 7e20ff16e..953c57faf 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1120,11 +1120,25 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 			err = ErrEntityNotExist
 		}
 	}
-	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
-	if len(storeSkus) > 0 {
-		skuBindInfos := []*StoreSkuBindInfo{}
-		FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
-	}
+	// storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
+	// if len(storeSkus) > 0 {
+	// 	storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, nil, nameID)
+	// 	err = err2
+	// 	skuBindInfos := []*StoreSkuBindInfo{}
+	// 	for _, v := range storeSkus2 {
+	// 		skus2 := []*StoreSkuBindSkuInfo{}
+	// 		skuBindInfo := &StoreSkuBindInfo{
+	// 			StoreID: v.StoreID,
+	// 		}
+	// 		sku2 := &StoreSkuBindSkuInfo{
+	// 			SkuID: sku.ID,
+	// 		}
+	// 		skus2 = append(skus2, sku2)
+	// 		skuBindInfo.Skus = skus2
+	// 		skuBindInfos = append(skuBindInfos, skuBindInfo)
+	// 	}
+	// 	FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
+	// }
 	return outSkuNameExt, err
 }
 
diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 48af40671..6252f2a3f 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -115,39 +115,26 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 	} else {
 		storeID = order.StoreID
 	}
-	if order.ConsigneeMobile2 == "" {
-		mobile = order.ConsigneeMobile
-	} else {
+	if order.ConsigneeMobile2 != "" {
 		mobile = order.ConsigneeMobile2
-	}
-	uoSMS, err := dao.GetUserOrderSMS(db, mobile, "")
-	stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
-	if len(stores) > 0 {
-		if stores[0].Tel1 == "" {
-			storeTel = stores[0].Tel2
-		} else {
-			storeTel = stores[0].Tel1
+		uoSMS, err := dao.GetUserOrderSMS(db, mobile, "")
+		stores, _ := dao.GetStoreList(db, []int{storeID}, nil, nil, nil, "")
+		if len(stores) > 0 {
+			if stores[0].Tel1 == "" {
+				storeTel = stores[0].Tel2
+			} else {
+				storeTel = stores[0].Tel1
+			}
 		}
-	}
-	if uoSMS == nil {
-		uoSMSc := &model.UserOrderSms{
-			Mobile:       mobile,
-			Name:         order.ConsigneeName,
-			VendorUserID: order.VendorUserID,
-			TotalCount:   0,
-			SMSMark:      model.NO,
-		}
-		err = dao.CreateEntity(db, uoSMSc)
-		err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
-			"tel": storeTel,
-		}, nil)
-		if err == nil {
-			uoSMS.SMSMark = model.YES
-			uoSMS.TotalCount++
-			_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
-		}
-	} else {
-		if uoSMS.SMSMark != model.YES {
+		if uoSMS == nil {
+			uoSMSc := &model.UserOrderSms{
+				Mobile:       mobile,
+				Name:         order.ConsigneeName,
+				VendorUserID: order.VendorUserID,
+				TotalCount:   0,
+				SMSMark:      model.NO,
+			}
+			err = dao.CreateEntity(db, uoSMSc)
 			err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
 				"tel": storeTel,
 			}, nil)
@@ -156,6 +143,17 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 				uoSMS.TotalCount++
 				_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
 			}
+		} else {
+			if uoSMS.SMSMark != model.YES {
+				err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+					"tel": storeTel,
+				}, nil)
+				if err == nil {
+					uoSMS.SMSMark = model.YES
+					uoSMS.TotalCount++
+					_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
+				}
+			}
 		}
 	}
 	return err

From 7f93e603b3e21b1eece1a3319035017188cadcac 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, 19 May 2020 17:31:17 +0800
Subject: [PATCH 150/285] =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E5=BC=80?=
 =?UTF-8?q?=E7=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/smsmsg/smsmsg.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 6252f2a3f..660e1076d 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -139,9 +139,10 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 				"tel": storeTel,
 			}, nil)
 			if err == nil {
-				uoSMS.SMSMark = model.YES
-				uoSMS.TotalCount++
-				_, err = dao.UpdateEntity(db, uoSMS, "SMSMark", "TotalCount")
+				uoSMS2, _ := dao.GetUserOrderSMS(db, mobile, "")
+				uoSMS2.SMSMark = model.YES
+				uoSMS2.TotalCount++
+				_, err = dao.UpdateEntity(db, uoSMS2, "SMSMark", "TotalCount")
 			}
 		} else {
 			if uoSMS.SMSMark != model.YES {

From 48d6ed401c7b90aa565d38d949abd66c4d245a7f 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, 19 May 2020 17:35:53 +0800
Subject: [PATCH 151/285] =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1=E5=BC=80?=
 =?UTF-8?q?=E7=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/smsmsg/smsmsg.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index 660e1076d..a59cbb478 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -135,7 +135,7 @@ func NotifyNewUserOrder(order *model.GoodsOrder) (err error) {
 				SMSMark:      model.NO,
 			}
 			err = dao.CreateEntity(db, uoSMSc)
-			err = SendSMSMsg([]string{uoSMS.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
+			err = SendSMSMsg([]string{uoSMSc.Mobile}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
 				"tel": storeTel,
 			}, nil)
 			if err == nil {

From f92076a26486a182fa4051b640413faeddfe6298 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, 19 May 2020 17:54:13 +0800
Subject: [PATCH 152/285] =?UTF-8?q?=E8=AE=A1=E7=AE=97earningprice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go |  6 +++++-
 business/jxstore/cms/sku.go           | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 8721db7a8..cba833510 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -392,7 +392,11 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 					if v.VendorPrice == v.SalePrice {
 						var earningPrice = 0
 						if v.ShopPrice < v.SalePrice {
-							earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.ShopPrice)) * utils.Int2Float64(storePayPercentage) / 100)))
+							if v.ShopPrice == 0 {
+								earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.SalePrice)) * utils.Int2Float64(storePayPercentage) / 100)))
+							} else {
+								earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.ShopPrice)) * utils.Int2Float64(storePayPercentage) / 100)))
+							}
 						} else {
 							earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.SalePrice)) * utils.Int2Float64(storePayPercentage) / 100)))
 						}
diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 953c57faf..cc5d3604a 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1120,15 +1120,21 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 			err = ErrEntityNotExist
 		}
 	}
-	// storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
+	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
 	// if len(storeSkus) > 0 {
 	// 	storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, nil, nameID)
 	// 	err = err2
-	// 	skuBindInfos := []*StoreSkuBindInfo{}
+	// 	storeIDs := make(map[int]int)
 	// 	for _, v := range storeSkus2 {
+	// 		storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+
+	// 		storeIDs[v.StoreID] = v.StoreID
+	// 	}
+	// 	skuBindInfos := []*StoreSkuBindInfo{}
+	// 	for _, v := range storeIDs {
 	// 		skus2 := []*StoreSkuBindSkuInfo{}
 	// 		skuBindInfo := &StoreSkuBindInfo{
-	// 			StoreID: v.StoreID,
+	// 			StoreID: v,
 	// 		}
 	// 		sku2 := &StoreSkuBindSkuInfo{
 	// 			SkuID: sku.ID,

From d1e8c7ad6655c805e6d7abf4f547f33917a99d47 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, 19 May 2020 17:54:37 +0800
Subject: [PATCH 153/285] =?UTF-8?q?=E8=AE=A1=E7=AE=97earningprice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index cc5d3604a..4b66b4cff 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1120,7 +1120,7 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 			err = ErrEntityNotExist
 		}
 	}
-	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
+	// storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
 	// if len(storeSkus) > 0 {
 	// 	storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, nil, nameID)
 	// 	err = err2

From 37d7217578f54b823ac2dcaf9cc3fdcb49ad3145 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 19 May 2020 20:40:01 +0800
Subject: [PATCH 154/285] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/mtwm/store.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go
index 8ffdd3060..c834465d2 100644
--- a/business/partner/purchase/mtwm/store.go
+++ b/business/partner/purchase/mtwm/store.go
@@ -130,12 +130,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		// }
 	}
 	// openLevel, isOnline := bizStatusJX2Mtwm(mergedStoreStatus)
-	phone := ""
-	if storeDetail.MarketManPhone != "" {
-		phone = storeDetail.MarketManPhone
-	} else {
-		phone = model.VendorStoreTel
-	}
+	//TODO 美团暂时不用那个电话
+	phone := storeDetail.Tel1
+	// if storeDetail.MarketManPhone != "" {
+	// 	phone = storeDetail.MarketManPhone
+	// } else {
+	// 	phone = model.VendorStoreTel
+	// }
 	params := map[string]interface{}{
 		"name":           name,                //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
 		"address":        storeDetail.Address, // 美团好像地址也不能改的?

From 31d1d5983b6803c7adc7b61e53d0f59743e31663 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, 20 May 2020 09:25:30 +0800
Subject: [PATCH 155/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go                   | 53 ++++++++++---------
 business/jxstore/cms/sync_store_sku.go        |  1 +
 business/partner/purchase/jdshop/store_sku.go | 53 +++++++++++--------
 3 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 4b66b4cff..979c72643 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1120,31 +1120,34 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 			err = ErrEntityNotExist
 		}
 	}
-	// storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
-	// if len(storeSkus) > 0 {
-	// 	storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, nil, nameID)
-	// 	err = err2
-	// 	storeIDs := make(map[int]int)
-	// 	for _, v := range storeSkus2 {
-	// 		storeMaps, err := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
-
-	// 		storeIDs[v.StoreID] = v.StoreID
-	// 	}
-	// 	skuBindInfos := []*StoreSkuBindInfo{}
-	// 	for _, v := range storeIDs {
-	// 		skus2 := []*StoreSkuBindSkuInfo{}
-	// 		skuBindInfo := &StoreSkuBindInfo{
-	// 			StoreID: v,
-	// 		}
-	// 		sku2 := &StoreSkuBindSkuInfo{
-	// 			SkuID: sku.ID,
-	// 		}
-	// 		skus2 = append(skus2, sku2)
-	// 		skuBindInfo.Skus = skus2
-	// 		skuBindInfos = append(skuBindInfos, skuBindInfo)
-	// 	}
-	// 	FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
-	// }
+	//增加规格则同步到门店，目前只做了京东商城的。
+	storeSkus, err := dao.GetStoreSkusByNameIDs(db, []int{model.JdShopMainStoreID}, nameID)
+	if len(storeSkus) > 0 {
+		storeIDs := make(map[int]int)
+		storeMaps, err2 := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+		err = err2
+		for _, v := range storeMaps {
+			storeSkus2, err2 := dao.GetStoreSkusByNameIDs(db, []int{v.StoreID}, nameID)
+			err = err2
+			if len(storeSkus2) > 0 {
+				storeIDs[v.StoreID] = v.StoreID
+			}
+		}
+		skuBindInfos := []*StoreSkuBindInfo{}
+		for _, v := range storeIDs {
+			skus2 := []*StoreSkuBindSkuInfo{}
+			skuBindInfo := &StoreSkuBindInfo{
+				StoreID: v,
+			}
+			sku2 := &StoreSkuBindSkuInfo{
+				SkuID: sku.ID,
+			}
+			skus2 = append(skus2, sku2)
+			skuBindInfo.Skus = skus2
+			skuBindInfos = append(skuBindInfos, skuBindInfo)
+		}
+		FocusStoreSkusBySku(ctx, skuBindInfos, true, true)
+	}
 	return outSkuNameExt, err
 }
 
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 2ccf2ea58..b9f2fe47b 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1386,6 +1386,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.Img = v[0].Img
 		storeSku.Img2 = v[0].Img2
 		storeSku.DescImg = v[0].DescImg
+		storeSku.JdsWareID = v[0].JdsWareID
 		rList = append(rList, storeSku)
 	}
 	return rList
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 74e4b844a..096e3f55c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -27,34 +27,45 @@ var (
 func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
+			//判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品
+			name := filterSensitiveWord(v.Name)
+			result, err := api.JdShopAPI.SearchWare4Valid(name)
 			if err != nil {
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 				return failedList, err
 			}
-			createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
-			if err != nil {
-				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
-				return failedList, err
-			}
-			var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
-			var resultAttrs = make(map[string]int64)
-			for _, vv := range createSkuParamSkus {
-				for _, vvv := range vv.SaleAttrs {
-					paramAttrs[vvv.AttrValues[0]] = vv
+			if result.TotalItem > 0 && len(result.Data) > 0 {
+
+			} else {
+				createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
+				if err != nil {
+					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+					return failedList, err
 				}
-			}
-			for _, vv1 := range createSkuResult.Skus {
-				for _, vvv1 := range vv1.SaleAttrs {
-					if paramAttrs[vvv1.AttrValues[0]] != nil {
-						resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
+				createSkuResult, err := api.JdShopAPI.CreateWare(createSkuParamWare, createSkuParamSkus)
+				if err != nil {
+					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+					return failedList, err
+				}
+				var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
+				var resultAttrs = make(map[string]int64)
+				for _, vv := range createSkuParamSkus {
+					for _, vvv := range vv.SaleAttrs {
+						paramAttrs[vvv.AttrValues[0]] = vv
 					}
 				}
-			}
-			for _, vv2 := range v.StoreSkuSyncInfoJds {
-				vv2.JdsWareID = createSkuResult.WareID
-				if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
-					vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+				for _, vv1 := range createSkuResult.Skus {
+					for _, vvv1 := range vv1.SaleAttrs {
+						if paramAttrs[vvv1.AttrValues[0]] != nil {
+							resultAttrs[paramAttrs[vvv1.AttrValues[0]].OuterID] = vv1.SkuID
+						}
+					}
+				}
+				for _, vv2 := range v.StoreSkuSyncInfoJds {
+					vv2.JdsWareID = createSkuResult.WareID
+					if resultAttrs[utils.Int2Str(vv2.SkuID)] != 0 {
+						vv2.VendorSkuID = utils.Int64ToStr(resultAttrs[utils.Int2Str(vv2.SkuID)])
+					}
 				}
 			}
 		}

From 582d9eb5057d40f6e95a3d3394bf6851db42121e 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, 20 May 2020 09:37:51 +0800
Subject: [PATCH 156/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 2ccf2ea58..f71e4afd6 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -431,6 +431,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	now := jxutils.OperationTime2HourMinuteFormat(time.Now())
 	var failedList []*partner.StoreSkuInfoWithErr
 	for _, sku := range skus {
+		if vendorID == model.VendorIDJDShop && storeID != model.JdShopMainStoreID {
+			sku.SkuSyncStatus = model.SyncFlagSaleMask
+		}
 		if !useVendorPriceDirectly &&
 			!isSkuLockTimeValid(sku) {
 			sku.VendorPrice = 0
@@ -483,13 +486,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		} else {
 			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
 				// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
-				err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
-				failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误")
-				if parentTask == nil {
-					return err
+				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID) {
+					err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
+					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误")
+					if parentTask == nil {
+						return err
+					}
+					parentTask.AddBatchErr(err)
+					parentTask.AddFailedList(failedList)
 				}
-				parentTask.AddBatchErr(err)
-				parentTask.AddFailedList(failedList)
 			} else {
 				isAdded2Update := false
 				// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改

From c3b2d88df54db36ccde577723e19c8987fd62e56 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, 20 May 2020 10:40:05 +0800
Subject: [PATCH 157/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 096e3f55c..82b276e77 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -35,7 +35,20 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				return failedList, err
 			}
 			if result.TotalItem > 0 && len(result.Data) > 0 {
-
+				for _, vv := range v.StoreSkuSyncInfoJds {
+					vv.JdsWareID = result.Data[0].WareID
+					updateSkusParam, err := buildUpdateSkusParam(v, vv)
+					if err != nil {
+						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+						return failedList, err
+					}
+					vendorSkuID, err := api.JdShopAPI.UpdateSkus(updateSkusParam)
+					if err != nil {
+						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+						return failedList, err
+					}
+					vv.VendorSkuID = vendorSkuID
+				}
 			} else {
 				createSkuParamWare, createSkuParamSkus, err := buildCreateWareParam(v)
 				if err != nil {
@@ -544,3 +557,50 @@ func filterSensitiveWord(name string) (result string) {
 	}
 	return name
 }
+
+func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInfo) (updateSkusParam *jdshopapi.UpdateSkusParam, err error) {
+	updateSkusParam = &jdshopapi.UpdateSkusParam{
+		WareID: storeSku.JdsWareID,
+	}
+	attrIDs := make(map[string]int)
+	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
+	for _, v := range attrs {
+		if v.Name == "规格" {
+			attrIDs[v.Name] = v.ID
+		}
+	}
+	var (
+		ggValueID    int64 //规格的属性id
+		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+	)
+	valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
+	specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
+	for _, v := range valuesSku {
+		if v.Name == specQuality {
+			ggValueID = v.ID
+		}
+	}
+	if ggValueID == 0 { //说明没有建这个规格，要建上
+		catID, _ := api.JdShopAPI.SaveVenderAttrValue(specQuality, attrIDs["规格"], int(storeSku.VendorVendorCatID), maxNo+1)
+		ggValueID = catID
+	}
+	attrSku := &jdshopapi.CreateSkuParamAttrs{
+		AttrID:     utils.Int2Str(attrIDs["规格"]),
+		AttrValues: []string{utils.Int64ToStr(ggValueID)},
+	}
+	attrsPropSku = append(attrsPropSku, attrSku)
+	sku := &jdshopapi.UpdateSkusParamSkus{
+		JdPrice: jxutils.IntPrice2Standard(v.VendorPrice),
+		Type:    "com.jd.pop.ware.ic.api.domain.sku",
+		Type2:   "com.jd.pop.ware.ic.api.domain.Sku",
+		OuterID: utils.Int2Str(v.SkuID),
+	}
+	sku.SaleAttrs = attrsPropSku
+	if v.Status == model.SkuStatusNormal {
+		sku.StockNum = "9999"
+	} else {
+		sku.StockNum = "0"
+	}
+	updateSkusParam.Skus[0] = sku
+	return updateSkusParam, err
+}

From 9073cbe6522d7dd9275c61bc89c3bb4c365bb252 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, 20 May 2020 10:46:02 +0800
Subject: [PATCH 158/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 82b276e77..c0b5cc28b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -572,6 +572,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	var (
 		ggValueID    int64 //规格的属性id
 		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+		skus         []*jdshopapi.UpdateSkusParamSkus
 	)
 	valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
@@ -601,6 +602,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	} else {
 		sku.StockNum = "0"
 	}
-	updateSkusParam.Skus[0] = sku
+	skus = append(skus, sku)
+	updateSkusParam.Skus = skus
 	return updateSkusParam, err
 }

From 6df82d79a5c4e11696e8d8bd7d9a93be747d29fd 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, 20 May 2020 10:55:02 +0800
Subject: [PATCH 159/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index c0b5cc28b..70999bafe 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -36,6 +36,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			}
 			if result.TotalItem > 0 && len(result.Data) > 0 {
 				for _, vv := range v.StoreSkuSyncInfoJds {
+					v.JdsWareID = result.Data[0].WareID
 					vv.JdsWareID = result.Data[0].WareID
 					updateSkusParam, err := buildUpdateSkusParam(v, vv)
 					if err != nil {

From 45214ba928847821abc6ea8b30ac89ba552f28af 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, 20 May 2020 11:48:04 +0800
Subject: [PATCH 160/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go                   |  3 +-
 business/jxstore/cms/sync_store_sku.go        |  5 +++
 business/partner/purchase/jdshop/store_sku.go | 34 +++++++++++++------
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index 979c72643..aecfe564d 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1286,7 +1286,8 @@ func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, e
 		return 0, err
 	}
 	dao.Commit(db)
-
+	if _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), []int{skuID}, model.SyncFlagDeletedMask); err == nil {
+	}
 	if num == 1 {
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
 	}
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index d260eee90..bb74e0df3 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -600,6 +600,11 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			createList = createList[:]
 			createList = rList
 		}
+		if len(updateList) > 0 {
+			rList2 := changeList2Jds(updateList)
+			updateList = updateList[:]
+			updateList = rList2
+		}
 	}
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 70999bafe..122660783 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -38,7 +38,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				for _, vv := range v.StoreSkuSyncInfoJds {
 					v.JdsWareID = result.Data[0].WareID
 					vv.JdsWareID = result.Data[0].WareID
-					updateSkusParam, err := buildUpdateSkusParam(v, vv)
+					updateSkusParam, err := buildUpdateSkusParam(v, vv, true)
 					if err != nil {
 						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 						return failedList, err
@@ -119,6 +119,14 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
+			for _, vv := range v.StoreSkuSyncInfoJds {
+				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
+				if err != nil {
+					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
+					return failedList, err
+				}
+				_, err = api.JdShopAPI.UpdateSkus(updateSkusParam)
+			}
 		}
 		if err != nil {
 			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
@@ -129,15 +137,16 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		// for _, v := range storeSkuList {
-		// 	err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
-		// 	if err == nil {
-		// 		err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
-		// 	}
-		// }
-		// if err != nil {
-		// 	failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
-		// }
+		for _, v := range storeSkuList {
+			err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
+			// err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
+			// if err == nil {
+			// 	err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+			// }
+		}
+		if err != nil {
+			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")
+		}
 	}
 	return failedList, err
 }
@@ -559,7 +568,7 @@ func filterSensitiveWord(name string) (result string) {
 	return name
 }
 
-func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInfo) (updateSkusParam *jdshopapi.UpdateSkusParam, err error) {
+func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInfo, isCreate bool) (updateSkusParam *jdshopapi.UpdateSkusParam, err error) {
 	updateSkusParam = &jdshopapi.UpdateSkusParam{
 		WareID: storeSku.JdsWareID,
 	}
@@ -603,6 +612,9 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	} else {
 		sku.StockNum = "0"
 	}
+	if !isCreate {
+		sku.SkuID = utils.Str2Int64(v.VendorSkuID)
+	}
 	skus = append(skus, sku)
 	updateSkusParam.Skus = skus
 	return updateSkusParam, err

From 0978e28a0475659d84ac45fd332c7562be4a44f0 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, 20 May 2020 13:48:59 +0800
Subject: [PATCH 161/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index bb74e0df3..8f94b7605 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -335,19 +335,11 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// 	}
 		// }()
 		if vendorID == model.VendorIDJDShop {
-			if syncStatus == model.SyncFlagNewMask {
-				for _, v := range storeSkuList {
-					updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
-					for k, vv := range v.StoreSkuSyncInfoJds {
-						updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
-						err = updateJdsWareID(db, vv)
-					}
-					num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
-				}
-			} else {
-				updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
-				for k, v := range storeSkuList {
-					updateItemList[k] = sku2Update(vendorID, v, syncStatus)
+			for _, v := range storeSkuList {
+				updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
+				for k, vv := range v.StoreSkuSyncInfoJds {
+					updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
+					err = updateJdsWareID(db, vv)
 				}
 				num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
 			}

From 6c0e6e366bf78a801b2172af6a7cd1bcd07714eb 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, 20 May 2020 13:55:29 +0800
Subject: [PATCH 162/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 8f94b7605..c69c1f3cf 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -335,11 +335,19 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// 	}
 		// }()
 		if vendorID == model.VendorIDJDShop {
-			for _, v := range storeSkuList {
-				updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
-				for k, vv := range v.StoreSkuSyncInfoJds {
-					updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
-					err = updateJdsWareID(db, vv)
+			if syncStatus != model.SyncFlagPriceMask {
+				for _, v := range storeSkuList {
+					updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
+					for k, vv := range v.StoreSkuSyncInfoJds {
+						updateItemList[k] = sku2Update(vendorID, vv, syncStatus)
+						err = updateJdsWareID(db, vv)
+					}
+					num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
+				}
+			} else {
+				updateItemList := make([]*dao.KVUpdateItem, len(storeSkuList))
+				for k, v := range storeSkuList {
+					updateItemList[k] = sku2Update(vendorID, v, syncStatus)
 				}
 				num, err = dao.BatchUpdateEntityByKV(db, updateItemList)
 			}

From fa6bd7b49ee0a6786fc3bd4c4d7d367065a49a0d 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, 20 May 2020 13:59:50 +0800
Subject: [PATCH 163/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 122660783..f91d5e40f 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -601,6 +601,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	}
 	attrsPropSku = append(attrsPropSku, attrSku)
 	sku := &jdshopapi.UpdateSkusParamSkus{
+		WareID:  storeSku.JdsWareID,
 		JdPrice: jxutils.IntPrice2Standard(v.VendorPrice),
 		Type:    "com.jd.pop.ware.ic.api.domain.sku",
 		Type2:   "com.jd.pop.ware.ic.api.domain.Sku",

From 510f9805c3fbcc7f81d7f79b6345c20057ddfac5 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, 20 May 2020 14:04:33 +0800
Subject: [PATCH 164/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index c67eacea7..eb22702a2 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -642,6 +642,8 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	sql = fmt.Sprintf(sql, fmtParams...)
+	fmt.Println(sql)
+	fmt.Println(sqlParams)
 	return ExecuteSQL(db, sql, sqlParams...)
 }
 

From 040206b63ef9082521b8643fcdb3378f1754a4f8 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, 20 May 2020 14:39:33 +0800
Subject: [PATCH 165/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go          | 2 +-
 business/jxstore/cms/sync_store_sku.go | 2 +-
 business/model/dao/store_sku.go        | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index a9f08249a..974537b6d 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1221,7 +1221,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
 		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
 		if _, err = SetStoreSkuSyncStatus2(db, nil, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
-			CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true)
+			// CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true)
 		}
 	}
 	if globals.IsAddEvent {
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index c69c1f3cf..003685dbb 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -486,7 +486,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		} else {
 			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
 				// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
-				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID) {
+				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.Status != model.SkuStatusDontSale) {
 					err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
 					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误")
 					if parentTask == nil {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index eb22702a2..c67eacea7 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -642,8 +642,6 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		sqlParams = append(sqlParams, skuIDs)
 	}
 	sql = fmt.Sprintf(sql, fmtParams...)
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	return ExecuteSQL(db, sql, sqlParams...)
 }
 

From 6bc9c436abacdede1d84b8485c6360b8781edfd6 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, 20 May 2020 14:46:04 +0800
Subject: [PATCH 166/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go | 8 ++++----
 conf/app.conf                 | 4 ++++
 globals/api/api.go            | 3 +++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 187bfbfb4..8a0e2348f 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -295,10 +295,10 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
-	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-		jdsCookie = configs[0].Value
-		api.JdShopAPI.SetCookieWithStr(jdsCookie)
-	}
+	// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+	// 	jdsCookie = configs[0].Value
+	// 	api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	// }
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
diff --git a/conf/app.conf b/conf/app.conf
index ab82ff91a..1a090e7a0 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -34,6 +34,8 @@ enableWscStoreWrite = false
 enableYbStoreWrite = false
 enableJdShopWrite = false
 
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
+
 aliKey = "LTAI4FwZN7pp4dACQHoapkZQ"
 aliSecret = "NTegceUFX0FdfMovqCDzqcIKmhcoOu"
 
@@ -186,6 +188,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
 
 elmIsProd = true
 elmToken  = ""
@@ -412,6 +415,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
+jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
 
 elmIsProd = true
 elmToken  = ""
diff --git a/globals/api/api.go b/globals/api/api.go
index 9fd4b40ec..1b876630e 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,6 +123,9 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
+		if jdsCookie := beego.AppConfig.DefaultString("jdsCookie", ""); jdsCookie != "" {
+			JdShopAPI.SetCookieWithStr(jdsCookie)
+		}
 	} else {
 		JdShopAPI = nil
 	}

From 71dd0f1011ff8e1560c562d703cf82daba1532e8 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, 20 May 2020 14:50:39 +0800
Subject: [PATCH 167/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 4027a6466..dd4f71c94 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -59,6 +60,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+			fmt.Println("test1", utils.Format4Output(api.JdShopAPI, false))
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}

From 40af80de90381a3a22b3f9d40436c28472a30c4b 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, 20 May 2020 14:53:26 +0800
Subject: [PATCH 168/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index dd4f71c94..8333693a6 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -60,7 +60,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			fmt.Println("test1", utils.Format4Output(api.JdShopAPI, false))
+			fmt.Println("test1", utils.Format4Output(api.JdShopAPI.APICookie, false))
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}

From 84ac32908737d21e6202e069673fb158855e84cf 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, 20 May 2020 14:57:16 +0800
Subject: [PATCH 169/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 8333693a6..996e01846 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -60,7 +60,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			fmt.Println("test1", utils.Format4Output(api.JdShopAPI.APICookie, false))
+			fmt.Println("test1", utils.Format4Output(api.JdShopAPI.APICookie.GetCookieCount(), false))
+			api.JdShopAPI.APICookie.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568")
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}

From 10068776e3154599d2d4f4e5fc4e92329a9d9902 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, 20 May 2020 15:34:54 +0800
Subject: [PATCH 170/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=A0=E9=99=A4=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go     | 3 ---
 business/partner/purchase/jdshop/store_sku.go | 6 ++++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 996e01846..4027a6466 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,7 +3,6 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -60,8 +59,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			fmt.Println("test1", utils.Format4Output(api.JdShopAPI.APICookie.GetCookieCount(), false))
-			api.JdShopAPI.APICookie.SetCookie("thor", "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568")
 			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index f91d5e40f..abfb1aa9a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -120,12 +120,14 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 			for _, vv := range v.StoreSkuSyncInfoJds {
-				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
+				api.JdShopAPI.DeleteSku(utils.Str2Int64(vv.VendorSkuID))
+				updateSkusParam, err := buildUpdateSkusParam(v, vv, true)
 				if err != nil {
 					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
 					return failedList, err
 				}
-				_, err = api.JdShopAPI.UpdateSkus(updateSkusParam)
+				vendorSkuID, err := api.JdShopAPI.UpdateSkus(updateSkusParam)
+				vv.VendorSkuID = vendorSkuID
 			}
 		}
 		if err != nil {

From 22c94ff6a3dfe737d1d71f5e42c8dfcca8b21aef 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, 20 May 2020 16:10:46 +0800
Subject: [PATCH 171/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index abfb1aa9a..dbc0d76cc 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -120,8 +120,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			}
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 			for _, vv := range v.StoreSkuSyncInfoJds {
-				api.JdShopAPI.DeleteSku(utils.Str2Int64(vv.VendorSkuID))
-				updateSkusParam, err := buildUpdateSkusParam(v, vv, true)
+				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
 				if err != nil {
 					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
 					return failedList, err
@@ -616,7 +615,11 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 		sku.StockNum = "0"
 	}
 	if !isCreate {
-		sku.SkuID = utils.Str2Int64(v.VendorSkuID)
+		result, err2 := api.JdShopAPI.FindSkuById(utils.Str2Int64(v.VendorSkuID))
+		err = err2
+		if specQuality != result.SaleAttrs[0].AttrValueAlias[0] {
+			api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
+		}
 	}
 	skus = append(skus, sku)
 	updateSkusParam.Skus = skus

From 4883b6f31546d58b95f83faa08fcc73195e46415 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, 20 May 2020 16:32:08 +0800
Subject: [PATCH 172/285] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=88=B0=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E5=88=A0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxutils/datares/datares.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go
index 31fdc9baf..1d6630372 100644
--- a/business/jxutils/datares/datares.go
+++ b/business/jxutils/datares/datares.go
@@ -159,9 +159,9 @@ func UploadImage2Vendors(ctx *jxcontext.Context, parentTask tasksch.ITask, dataR
 	if dataRes.MtwmURL == "" {
 		vendorIDs = append(vendorIDs, model.VendorIDMTWM)
 	}
-	if dataRes.JdsURL == "" {
-		vendorIDs = append(vendorIDs, model.VendorIDJDShop)
-	}
+	// if dataRes.JdsURL == "" {
+	// 	vendorIDs = append(vendorIDs, model.VendorIDJDShop)
+	// }
 	if len(vendorIDs) > 0 {
 		imgName := jxutils.GetShortNameFromURL(dataRes.MainURL)
 		task := tasksch.NewSeqTask(fmt.Sprintf("上传图片至平台1:%s,%s", dataRes.Name, dataRes.MainURL), ctx,
@@ -208,10 +208,11 @@ func UploadImage2Vendors(ctx *jxcontext.Context, parentTask tasksch.ITask, dataR
 							} else if vendorID == model.VendorIDMTWM {
 								dataRes.MtwmURL = imgHint
 								updateField = "MtwmURL"
-							} else if vendorID == model.VendorIDJDShop {
-								dataRes.JdsURL = imgHint
-								updateField = "JdsURL"
 							}
+							// else if vendorID == model.VendorIDJDShop {
+							// 	dataRes.JdsURL = imgHint
+							// 	updateField = "JdsURL"
+							// }
 							dao.UpdateEntity(db, dataRes, updateField)
 						}
 					}

From a80258668ded53fe6584944076836437f34afb76 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, 20 May 2020 17:18:17 +0800
Subject: [PATCH 173/285] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=9C=AA=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 003685dbb..c8deeae64 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -486,7 +486,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		} else {
 			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
 				// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
-				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.Status != model.SkuStatusDontSale) {
+				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.StoreSkuStatus != model.SkuStatusDontSale) {
 					err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
 					failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "异常同步错误")
 					if parentTask == nil {

From 3cca629188d2dcb07807e1dd9fdbba94409206c4 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, 20 May 2020 17:37:22 +0800
Subject: [PATCH 174/285] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=9C=AA=E5=88=9B=E5=BB=BA=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/app.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 1a090e7a0..ef6f86ce8 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -34,7 +34,7 @@ enableWscStoreWrite = false
 enableYbStoreWrite = false
 enableJdShopWrite = false
 
-jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
+jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY"
 
 aliKey = "LTAI4FwZN7pp4dACQHoapkZQ"
 aliSecret = "NTegceUFX0FdfMovqCDzqcIKmhcoOu"
@@ -188,7 +188,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
-jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
+jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY"
 
 elmIsProd = true
 elmToken  = ""
@@ -415,7 +415,7 @@ jdEclpAppSecret = "f16a5e57ff4f4f428b702c40d2d4b933"
 jdShopAccessToken = "de8157b447584885910f429011e49cb93yjq"
 jdShopAppKey = "E1D746D42474D5F1F1A10CECE75D99F6"
 jdShopAppSecret = "efa7e1d1a22640fa990e6cf164b28608"
-jdsCookie = "thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0A74B88873C7657CFD518E07B0319B489D0282895A6DF7C0E1C67590D2864D06769657402E80191AB425B126C59F29522AE1C00344E2CF8D60E007F25BB4C1DE11431856BF15070B700ACB33124EA2661AE6D93D1E1A2A4D18A838CB5664BD7DFE61C73899267AC2D01237897F6D808568;"
+jdsCookie = "shshshfpa=13b38d4a-8ba0-df12-0012-82d9a37fb835-1573795914; shshshfpb=abYp8Dq5JobRtp2pkZa7MbA%3D%3D; __jdu=1142616513; pinId=WMIzMhF5BfL6nJp9AcA2-A; pin=shop_jxcs; unick=shop_jxcs; _tp=7FBEvLyPe%2FKcgxsfY5lRgA%3D%3D; _pst=shop_jxcs; areaId=22; ipLoc-djd=22-1930-50948-57092; user-key=3ec204b4-f204-4320-98e3-b2569c757800; cn=0; shshshfp=5d23828ee6ea3a33e1a58588db1713f8; 3AB9D23F7A4B3C9B=AK36FFYF5J6WMPRH7YTXMEX4CATHR6NAA3IQEESU2I33FEJRQ3DRLU4SZJYD2XGFLCFW43DHYP5HQKOMR4EFQSLKLA; navigation=[%22shop_jxcs%22]; __jdv=122270672|baidu|-|organic|not set|1589514011252; language=zh_CN; ceshi3.com=000; csrf_token=b84d0a5c-6288-4db4-84e1-cadf66be3bf7; mba_muid=1142616513; TrackID=1qvZk-6QSAOp1NmaouJGEx58_cFglCFv57HEfoHOezMrOnV3_FSK-5ExeYhHx97IltBADG3dvJqLIt3P57wyUW4Z2Q3Y8ITo8Cfdmlz3kykM; RT="z=1&dm=jd.com&si=mcot45862q&ss=kaf1rcqz&sl=2&tt=38t&ld=22qx&nu=b99e5a7f32b36f184614d34a1d926a39&cl=3clu&ul=3crs&hd=3cz3"; b-sec=S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG; thor=80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF; _vender_=TNK3O6PALVQGGA33SGBIUTOKL4OOE6DP6OMNVIPMAMULGTRFWUMTVWGFRUTYP4L4EPN3KP73P33BOBN5SNJFBNQB5OMQYSJ5MORGQLJS7QAPOMIN7AZD6B3ZLP2DV4JCXDI5P3KOXJ3PHLIIRZ2YVS4JSSA3JRSBACNLJSC24ELO46GIMRW53XGW36EBPLZMZP2MQCAMJNO44FKT46B7VDVT7KQTELESOOF6E377AYC3NWKQF6ICIYBW4BA4JL5QG2NHGNOHOUJDNUW3N22UF32DLFLEIQGVO2W55J6AKPPBT227XA5NO4S3NFVIUUUADGOYH56T72MTNXCILWVMN4RMUNVFMGL4ISGXJS7YILE7A2ESPAU43MISAOZM2BR53MGRB5OZSQZPV5DBDCN2OVVT3XT5N2VMFELARQNTMAJCDBGXFURSN2Q7SYULLKZEZHTYWWOI65LS5OIHLUZQKWFGMNSQF2UBSYV7FG46CWJGMVHOGV3FY4RUEVJK6BQ223QK3H3VMTHXCZOZV4GKR5EWGIZZDVUAK4B36BPA5HPBO7PXKBOEXEBX77IYBNQLCGMK72J4VKNOUPYKNB5JE5D5UN3R2MMFGLJARTL2QTC5ZRZ4PJCJZWWOV37VWLWFVAN5IGHPAYME73KTNFABM5W73XLOXJFQWTFRZEK3FCL3BLRV4UOXLBQGA34R4WUBYSZURMKTXXB7U; __jda=65775340.1142616513.1573036516.1589946171.1589952725.54; __jdb=65775340.147.1142616513|54.1589952725; __jdc=65775340; _base_=YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ATJFKID7XOR3NQ2CL6K7A2IEZV5HCBNYDPXFCM2ZMCS474KZ44S5F; _vender_new_=GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4OUZSED6FTSEZHTM363E7XXCHB4NA7VLZHCQSBHDVGMRA7RM4RGJC3MOI4TJNGCLW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBEOW5ID2ZMQ3XV264IU4MYHN64RA; _BELONG_CLIENT_=WPSC4XJXWK5USS4JNZY2X7VRLR5MCBKRSVHEXABGTHDGISIQK5YOLZUXYE7IOIM7MOKO74H6CRN6WHAAR4TMDV3XZWMXZRCRT5XRNE3V356BTOB2Y7LPK66VWQK6HPTGWVXIDXDCPVE3W5WMHAIO6AT2LX2XXVNUCXR34ZWFK6HY45CORGIKOSYDYZBF27WOKTUX6BS4FZMIJWNUX6CB4JAA25ZLF7ZEKYOO4QV5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BMTUJZACIBHXQFAVLRF76VQY5PNJGGJNBEZHSFYYJA3YORRT7FB5AHCOIFQKF3W5RWNUX6CB4JAA26JNMO7AYWNUPZF5HTSBXGNRM3E242MBI6V5D4C5VJDQ3EOYCOW5BWZDKMOJ5BS6II53ERY6ALV3ZWPF42L4CPUHEGPYIII35KDC4FCNVCORCXFD6IVNLBEDPB2GGP4UHWNRUDOQBDIW7RZJXBA2WV5ANZOTEGUCDWYRVQS2YUTIZNZ276PRYG4N56V6YTII7MBKBC7LYHO7C555HTSBXGNRM3E466AYN67DHWVM5HQFJ4NFDO5BTOKMOS5L2CXFVYDR2FCOILVYPEI; _lvtc_=5ZH3OJ7CWYNVGEKDRC32XTFXGY"
 
 elmIsProd = true
 elmToken  = ""

From 3cba0f6593ee03cb311b0d4a7103fe731223161e 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, 20 May 2020 17:49:47 +0800
Subject: [PATCH 175/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 4027a6466..901149c2a 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,6 +3,9 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -58,8 +61,18 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
-			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
+			// mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+			request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
+			c := &http.Cookie{
+				Name:  "thor",
+				Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
+			}
+			request.AddCookie(c)
+			client := &http.Client{}
+			response, _ := client.Do(request)
+			defer response.Body.Close()
+			bodyData, _ := ioutil.ReadAll(response.Body)
+			fmt.Println("test1", string(bodyData))
 		}
 	}
 	return err

From 651ba7f116c7e5a986656f3dee7681611591cd02 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, 20 May 2020 17:58:27 +0800
Subject: [PATCH 176/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 901149c2a..c15a82b48 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -69,6 +69,8 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			}
 			request.AddCookie(c)
 			client := &http.Client{}
+			fmt.Println("test1", request.URL)
+			fmt.Println("test1", utils.Format4Output(request, false))
 			response, _ := client.Do(request)
 			defer response.Body.Close()
 			bodyData, _ := ioutil.ReadAll(response.Body)

From 7a103c132dd39496c7fa777f3fe1019d6d838a66 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, 20 May 2020 18:03:23 +0800
Subject: [PATCH 177/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index c15a82b48..312e88618 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -67,7 +67,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				Name:  "thor",
 				Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
 			}
+			c1 := &http.Cookie{
+				Name:  "b-sec",
+				Value: "S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG",
+			}
 			request.AddCookie(c)
+			request.AddCookie(c1)
 			client := &http.Client{}
 			fmt.Println("test1", request.URL)
 			fmt.Println("test1", utils.Format4Output(request, false))

From 60d2b9fc1785c2f679d7e1cef9807e97c2ec4885 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, 20 May 2020 18:06:33 +0800
Subject: [PATCH 178/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 312e88618..1ad0c4ec0 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -71,8 +71,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				Name:  "b-sec",
 				Value: "S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG",
 			}
+			c2 := &http.Cookie{
+				Name:  "csrf_token",
+				Value: "b84d0a5c-6288-4db4-84e1-cadf66be3bf7",
+			}
 			request.AddCookie(c)
 			request.AddCookie(c1)
+			request.AddCookie(c2)
 			client := &http.Client{}
 			fmt.Println("test1", request.URL)
 			fmt.Println("test1", utils.Format4Output(request, false))

From 8fb9734692e741ac8ab54461eb33e6bf7e7e0b18 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, 20 May 2020 18:12:29 +0800
Subject: [PATCH 179/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 1ad0c4ec0..2b011f371 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -68,12 +68,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
 			}
 			c1 := &http.Cookie{
-				Name:  "b-sec",
-				Value: "S2JWP6CAFP7K4I6PXVBUVCO6YVXUX2JAPDHLX5RZUDE4YKCGOEXJIINB3Q4THCFCMVWZPFAYGLWLG",
+				Name:  "_base_",
+				Value: "YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASILBDT4U2UVRXFS7RJGNGDTM3G7CBNYDPXFCM2ZMCS474KZ44S5F",
 			}
 			c2 := &http.Cookie{
-				Name:  "csrf_token",
-				Value: "b84d0a5c-6288-4db4-84e1-cadf66be3bf7",
+				Name:  "_vender_new_",
+				Value: "GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4PV5UJFFDEEZPVS27H5WWUSI734NA7VLZHCQSBHD5PNCJJIZBGL4F5C5EQN5GDFEW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBFMTROLMGF26RIU3MLWUSQCHHHZQ",
 			}
 			request.AddCookie(c)
 			request.AddCookie(c1)

From 9b9d5c413f690654bd1b387af5a730a18793cf5e 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, 20 May 2020 18:19:27 +0800
Subject: [PATCH 180/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go              | 56 +++++++++++++++--------
 business/partner/purchase/jdshop/store.go | 11 -----
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 8eb73cd58..489c7aef3 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -229,7 +229,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 		var failedList []*partner.StoreSkuInfoWithErr
 		handler := v.GetStoreHandler(loopMapInfo.VendorID)
 		if handler != nil {
-			if len(loopMapInfo.StoreMapList) > 0 {
+			if len(loopMapInfo.StoreMapList) > 1 {
 				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						var resultList []interface{}
@@ -272,25 +272,43 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 					}, loopMapInfo.StoreMapList)
 				t.AddChild(loopStoreTask).Run()
 				resultList, err = loopStoreTask.GetResult(0)
+			} else {
+				var resultList []interface{}
+				db2 := db
+				var vendorStoreID string
+				storeMap := loopMapInfo.StoreMapList[0]
+				if model.IsSyncStatusNew(storeMap.SyncStatus) {
+					if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName); err == nil {
+						resultList = append(resultList, 1)
+					} else {
+						failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "创建门店")
+					}
+				} else if model.IsSyncStatusDelete(storeMap.SyncStatus) {
+					if err = handler.DeleteStore(db2, storeMap.StoreID, userName); err == nil {
+						resultList = append(resultList, 1)
+					} else {
+						failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店")
+					}
+				} else {
+					if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
+						storeMap.SyncStatus = 0
+						_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+					} else {
+						failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "更新门店")
+					}
+				}
+				if err == nil {
+					resultList = []interface{}{1}
+					if model.IsSyncStatusNew(storeMap.SyncStatus) {
+						storeMap.VendorStoreID = vendorStoreID
+						storeMap.SyncStatus = 0
+						_, err = dao.UpdateEntity(db, storeMap, "VendorStoreID", model.FieldSyncStatus)
+					} else {
+						storeMap.SyncStatus = 0
+						_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+					}
+				}
 			}
-			// else {
-			// 	storeMap := loopMapInfo.StoreMapList[0]
-			// 	if model.IsSyncStatusNew(storeMap.SyncStatus) {
-
-			// 	} else if model.IsSyncStatusDelete(storeMap.SyncStatus) {
-
-			// 	} else {
-			// 		if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
-			// 			storeMap.SyncStatus = 0
-			// 			_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
-			// 		} else {
-			// 			failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "更新门店")
-			// 		}
-			// 	}
-			// 	if err == nil {
-			// 		resultList = []interface{}{1}
-			// 	}
-			// }
 			err = partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}
 		if len(failedList) > 0 {
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 2b011f371..62365c786 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -67,20 +67,9 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				Name:  "thor",
 				Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
 			}
-			c1 := &http.Cookie{
-				Name:  "_base_",
-				Value: "YKH2KDFHMOZBLCUV7NSRBWQUJPBI7JIMU5R3EFJ5UDHJ5LCU7R2NILKK5UJ6GLA2RGYT464UKXAI4Z6HPCTN4UQM3WHVQ4ENFP57OC2DC7JQLRXRUO5PW6B77O6UXAZ4TCNE6YVKRXISVLBYGYO44RCDDPWDA4AEL7ZLXI2SG4SOQWCP5WPWO6EFS7HEHMRWVKBRVHB33TFD4SMNBHRJCTDFHU6SZXCZD6RFXX2OORYGL5H2GYF2IIH2KKD4T72IR4F577G2E5II2OMMXYF2GDYNTS7WGAUXFEWRJ3CTKDBDWMHUKJQF4ZFOTNBBYBIZRXZYERXXIG6ASILBDT4U2UVRXFS7RJGNGDTM3G7CBNYDPXFCM2ZMCS474KZ44S5F",
-			}
-			c2 := &http.Cookie{
-				Name:  "_vender_new_",
-				Value: "GI63BGTJFDBQ46CD7JXUX3HEPM4P5LEA3TJTFGW4ZGGIVOLTPK5T25EXTBLCENPUTR7E2I23YDFQ4ARO6JW3NHSWBDE73RTUKJTADIPFPLYFE3ARGJUBPHWUIONS72KRQOZC5P7PB4VPPLRHGEP7L3Z5K62L2E2MGTWHFJRQ3CAVBDYVW2Z4J6U73HW4BKKOCDAH5T6OJJKWKLBZFOTI7342QSL7YQ2E3I4T777RNZF23XGOTCP3D4INHNO5MNKT3XJZQBVHWUVZYQUXCK5QQTKWADKQUCYV3JRY6YAYOD7Z5IIKGNLREQTCPO7SYGSIS655JUGOUILFLXVZE6KCFG7ZTPRUD6VPE4KCIE4PV5UJFFDEEZPVS27H5WWUSI734NA7VLZHCQSBHD5PNCJJIZBGL4F5C5EQN5GDFEW6QKUCCZAY7XTGOTMC53TFUYERGNIH2RBULZ7UTZH5GU3TC6RWFI2QL4QTAIARA6GNVXENEOYIPZEHN222YDAJX5OBBEECAMAPNKZ3XNF5CNGDJ3DSU2ZLOCAKLFPCYTIIWPPJMCQ636F5464HS4OVFPFNIDW4OCE23JRPYP5FAL6TKHPAC3H3ZRU7WA5GKJJKBZUGIX7NEO4LZB7FJ3RZZZH3UHPQMNILD5DT2V7HVCUOVNOFBFMTROLMGF26RIU3MLWUSQCHHHZQ",
-			}
 			request.AddCookie(c)
-			request.AddCookie(c1)
-			request.AddCookie(c2)
 			client := &http.Client{}
 			fmt.Println("test1", request.URL)
-			fmt.Println("test1", utils.Format4Output(request, false))
 			response, _ := client.Do(request)
 			defer response.Body.Close()
 			bodyData, _ := ioutil.ReadAll(response.Body)

From 125f54167014fd4542f0cea3afbbca66eb708e9c 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, 20 May 2020 18:23:17 +0800
Subject: [PATCH 181/285] =?UTF-8?q?=E7=BB=88=E6=9E=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go      |  3 +--
 business/jxstore/tempop/tempop.go | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 489c7aef3..5f79931eb 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -291,8 +291,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 					}
 				} else {
 					if err = handler.UpdateStore(db, storeMap.StoreID, userName); err == nil {
-						storeMap.SyncStatus = 0
-						_, err = dao.UpdateEntity(db, storeMap, model.FieldSyncStatus)
+						resultList = append(resultList, 1)
 					} else {
 						failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "更新门店")
 					}
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index ea0472d24..8bbf9af3d 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/business/jxutils/smsmsg"
-
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1519,9 +1519,17 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		}
 	// 	}
 	// }
-	err = smsmsg.SendSMSMsg([]string{"17096577102,531"}, globals.SMSSignName, globals.SMSNewUserOrderTemplate, map[string]interface{}{
-		"tel": "123",
-	}, nil)
-
+	request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
+	c := &http.Cookie{
+		Name:  "thor",
+		Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
+	}
+	request.AddCookie(c)
+	client := &http.Client{}
+	fmt.Println("test1", request.URL)
+	response, _ := client.Do(request)
+	defer response.Body.Close()
+	bodyData, _ := ioutil.ReadAll(response.Body)
+	fmt.Println("test1", string(bodyData))
 	return err
 }

From d498a2156342dc93a41c3f287b3064ce4555e686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 09:28:37 +0800
Subject: [PATCH 182/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop_test.go        | 18 ++++++++
 business/partner/purchase/jdshop/store.go     | 43 +++++++++----------
 business/partner/purchase/jdshop/store_sku.go |  5 ++-
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/business/jxstore/tempop/tempop_test.go b/business/jxstore/tempop/tempop_test.go
index 4ad4b6e38..06875b096 100644
--- a/business/jxstore/tempop/tempop_test.go
+++ b/business/jxstore/tempop/tempop_test.go
@@ -1,6 +1,9 @@
 package tempop
 
 import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
 	"testing"
 
 	"git.rosy.net.cn/jx-callback/globals/api2"
@@ -24,3 +27,18 @@ func TestJdStoreInfo1125(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func Testaa(t *testing.T) {
+	request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
+	c := &http.Cookie{
+		Name:  "thor",
+		Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
+	}
+	request.AddCookie(c)
+	client := &http.Client{}
+	fmt.Println("test1", request.URL)
+	response, _ := client.Do(request)
+	defer response.Body.Close()
+	bodyData, _ := ioutil.ReadAll(response.Body)
+	fmt.Println("test1", string(bodyData))
+}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 62365c786..6afea2a48 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,9 +3,6 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -19,9 +16,9 @@ import (
 )
 
 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string) (storeDetail *dao.StoreDetail, err error) {
-	result, err := api.JdShopAPI.NewInfoList(utils.Str2Int64(vendorStoreID))
-	storeDetail.VendorStoreID = vendorStoreID
-	storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus)
+	// result, err := api.JdShopAPI.NewInfoList(utils.Str2Int64(vendorStoreID))
+	// storeDetail.VendorStoreID = vendorStoreID
+	// storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus)
 	result2, err := api.JdShopAPI.QueryEntityStore(utils.Str2Int64(vendorStoreID))
 	storeDetail.ID = utils.Str2Int(result2.ExStoreID)
 	storeDetail.Name = result2.StoreName
@@ -59,23 +56,23 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		CustomerID:  utils.Int2Str(store.ID),
 	}
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
-	if err == nil {
-		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
-			// mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
-			c := &http.Cookie{
-				Name:  "thor",
-				Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
-			}
-			request.AddCookie(c)
-			client := &http.Client{}
-			fmt.Println("test1", request.URL)
-			response, _ := client.Do(request)
-			defer response.Body.Close()
-			bodyData, _ := ioutil.ReadAll(response.Body)
-			fmt.Println("test1", string(bodyData))
-		}
-	}
+	// if err == nil {
+	// 	if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
+	// 		// mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+	// 		request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
+	// 		c := &http.Cookie{
+	// 			Name:  "thor",
+	// 			Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
+	// 		}
+	// 		request.AddCookie(c)
+	// 		client := &http.Client{}
+	// 		fmt.Println("test1", request.URL)
+	// 		response, _ := client.Do(request)
+	// 		defer response.Body.Close()
+	// 		bodyData, _ := ioutil.ReadAll(response.Body)
+	// 		fmt.Println("test1", string(bodyData))
+	// 	}
+	// }
 	return err
 }
 
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index dbc0d76cc..c690172aa 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -102,6 +102,8 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				pic3, err2 := uploadImg2(v.DescImg, name, "desc")
 				err = err2
 				desc = `<p><img src="` + jdshopapi.JdsImgURL + pic3 + `" style="width: auto; height: auto; max-width: 100%;"><br></p><p><br></p>`
+			} else {
+				desc = `<p><br></p><p><br></p>`
 			}
 			updateWareParam.Introduction = desc
 			updateWareParam.MobileDesc = desc
@@ -524,7 +526,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			sku.StockNum = 0
 		}
 	}
-	createSkuParamWare.MarketPrice = jxutils.IntPrice2Standard(vendorPrice)
+	//市场价固定500
+	createSkuParamWare.MarketPrice = 500
 	return createSkuParamWare, createSkuParamSkus, err
 }
 

From b0f959af557a99b3249d67383f2400a5185ed0f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 09:57:03 +0800
Subject: [PATCH 183/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95reqeust?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 8bbf9af3d..bd813bb54 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1527,6 +1527,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	request.AddCookie(c)
 	client := &http.Client{}
 	fmt.Println("test1", request.URL)
+	request.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36")
 	response, _ := client.Do(request)
 	defer response.Body.Close()
 	bodyData, _ := ioutil.ReadAll(response.Body)

From ae9d938f95df9932ade031a0c0643411f1114685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 10:04:45 +0800
Subject: [PATCH 184/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95reqeust?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index bd813bb54..154c2d9f4 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1527,7 +1527,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	request.AddCookie(c)
 	client := &http.Client{}
 	fmt.Println("test1", request.URL)
-	request.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36")
+	fmt.Println("test2", *request)
 	response, _ := client.Do(request)
 	defer response.Body.Close()
 	bodyData, _ := ioutil.ReadAll(response.Body)

From b1ed5efeedd588dedfe2952f6ba8e0dbc0328020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 10:17:16 +0800
Subject: [PATCH 185/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95reqeust?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 154c2d9f4..665ab5054 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1526,8 +1526,13 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	}
 	request.AddCookie(c)
 	client := &http.Client{}
-	fmt.Println("test1", request.URL)
-	fmt.Println("test2", *request)
+	fmt.Println(request.URL)
+	fmt.Println(request.UserAgent())
+	fmt.Println(request.Proto)
+	fmt.Println(request.Referer())
+	fmt.Println(request.Context().Deadline())
+	fmt.Println(request.Host)
+	fmt.Println(request.RemoteAddr)
 	response, _ := client.Do(request)
 	defer response.Body.Close()
 	bodyData, _ := ioutil.ReadAll(response.Body)

From d678e943f01d39f1f9bb54a72a20d4be6c8a52cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 10:30:01 +0800
Subject: [PATCH 186/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95reqeust?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 665ab5054..cc9b98420 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1526,13 +1526,12 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	}
 	request.AddCookie(c)
 	client := &http.Client{}
-	fmt.Println(request.URL)
-	fmt.Println(request.UserAgent())
-	fmt.Println(request.Proto)
-	fmt.Println(request.Referer())
-	fmt.Println(request.Context().Deadline())
-	fmt.Println(request.Host)
-	fmt.Println(request.RemoteAddr)
+	deadline := 1
+	d := time.Now().Add(time.Duration(deadline) * time.Second) // deadline max
+	ctx2, cancel := context.WithDeadline(context.Background(), d)
+	defer cancel()
+	request.WithContext(ctx2)
+	fmt.Println(request)
 	response, _ := client.Do(request)
 	defer response.Body.Close()
 	bodyData, _ := ioutil.ReadAll(response.Body)

From 9271052a9edfd1513c07b16efc923b03a898cc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 10:38:56 +0800
Subject: [PATCH 187/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go             | 5 -----
 business/partner/purchase/jdshop/store_sku.go | 6 +++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index cc9b98420..045d7dc5c 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1526,11 +1526,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	}
 	request.AddCookie(c)
 	client := &http.Client{}
-	deadline := 1
-	d := time.Now().Add(time.Duration(deadline) * time.Second) // deadline max
-	ctx2, cancel := context.WithDeadline(context.Background(), d)
-	defer cancel()
-	request.WithContext(ctx2)
 	fmt.Println(request)
 	response, _ := client.Do(request)
 	defer response.Body.Close()
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index c690172aa..d208a47c0 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -169,7 +169,11 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 			if vendorStoreID == model.JdShopMainVendorStoreID {
 				err = api.JdShopAPI.UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
 			} else {
-				err = api.JdShopAPI.UpdateSkuSiteStock(utils.Str2Int(v.VendorSkuID), stock, utils.Str2Int(vendorStoreID))
+				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{storeID}, []int{v.SkuID})
+				err = err2
+				if len(storeSkus) > 0 {
+					err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
+				}
 			}
 		}
 		if err != nil {

From 185c2a4be70343c7621676d1dc05207f3acbcabe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 14:15:07 +0800
Subject: [PATCH 188/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go   | 30 +++++++++++++++++++++
 business/jxstore/cms/sync.go  | 50 +++++++++++++++++++++++++++++++++++
 business/jxstore/misc/misc.go |  8 +++---
 business/model/store.go       |  1 +
 4 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index e6df5aa6c..2ff307dc0 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -224,6 +224,36 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		}
 	}
 	db := dao.GetDB()
+	//获取门店信息
+	var (
+		stores        []*model.Store
+		order         *model.GoodsOrder
+		storeName     string
+		storeID       int
+		vendorOrderID string
+	)
+	sql := `
+		SELECT * FROM store WHERE tel1 = ? OR tel2 = ? 
+	`
+	sqlParams := []interface{}{mobileNum}
+	err = dao.GetRows(db, &stores, sql, sqlParams)
+	if len(stores) > 0 {
+		storeName = stores[0].Name
+		storeID = stores[0].ID
+	}
+	sql2 := `
+		SELECT * 
+		  FROM goods_order 
+		 WHERE IF(store_id <> '', store_id, jx_store_id) = ?
+		 ORDER BY order_created_at DESC
+		 LIMIT 1  
+	`
+	sqlParams2 := []interface{}{}
+	err = dao.GetRow(db, &order, sql2, sqlParams2)
+	if order != nil {
+		vendorOrderID = order.VendorOrderID
+	}
+	msgContent = msgContent + " 门店名称：" + storeName + " 门店ID：" + utils.Int2Str(storeID) + " 最新订单号：" + vendorOrderID
 	for _, v := range receiveMsgUsersMap[msgType] {
 		user, err2 := dao.GetUserByID(db, "name", v)
 		if err2 == nil {
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 5f79931eb..b88003ab0 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1083,3 +1083,53 @@ func syncStoreSkusFromYb(ctx *jxcontext.Context, storeID, vendorID int, vendorSt
 	hint = taskSeq.GetID()
 	return hint, err
 }
+
+func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, vendorStoreID string, isAsync, isContinueWhenError bool) (hint string, err error) {
+	var (
+		db = dao.GetDB()
+	)
+	_, hint, err = v.LoopStoresMap2(ctx, nil, db, fmt.Sprintf("同步京东商城库存商品信息:%v", storeIDs), isAsync, true, []int{model.VendorIDJDShop}, storeIDs, false,
+		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
+			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
+			if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil {
+				parallelCount := 5
+				if model.MultiStoresVendorMap[loopMapInfo.VendorID] == 1 {
+					parallelCount = 2
+				}
+				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]),
+					tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx,
+					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+						storeMap := batchItemList[0].(*model.StoreMap)
+						if storeMap.Status > model.StoreStatusDisabled && storeMap.StoreID != model.JdShopMainStoreID && storeMap.SyncRule != 0 {
+							err = syncJdsStoresSkus(ctx, db, storeMap)
+						}
+						return nil, err
+					}, loopMapInfo.StoreMapList)
+				t.AddChild(loopStoreTask).Run()
+				_, err = loopStoreTask.GetResult(0)
+			}
+			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
+		}, isContinueWhenError)
+	return hint, err
+}
+
+func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, storeMap *model.StoreMap) (err error) {
+	var (
+		mainSkusMap = make(map[int]*model.StoreSkuBind)
+	)
+	storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
+	for _, v := range storeSkusMain {
+		mainSkusMap[v.SkuID] = v
+	}
+	storeSkus, err := dao.GetStoresSkusInfo(db, []int{storeMap.StoreID}, nil)
+	for _, v := range storeSkus {
+		if mainSkusMap[v.SkuID] != nil {
+
+		} else {
+			if storeMap.SyncRule == 1 {
+
+			}
+		}
+	}
+	return err
+}
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 8a0e2348f..ea2bf20e9 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -350,16 +350,16 @@ func syncStoreSku() {
 				errList.AddErr(err)
 			case 1:
 				//TODO 暂时不同步银豹（可能要从银豹到京西），2020-04-27
-				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, []int{1, 3}))
+				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, []int{1, 3, 5}))
 
 				// errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, partner.GetSingleStoreVendorIDs()))
-				_, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3}, nil, false, true, cms.AmendPruneAll, false)
+				_, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3, 5}, nil, false, true, cms.AmendPruneAll, false)
 
 				// _, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, partner.GetSingleStoreVendorIDs(), nil, false, true, cms.AmendPruneAll, false)
 				errList.AddErr(err)
 
 				SaveImportantTaskID(TaskNameSyncStoreSku, SpecialTaskID)
-				taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{1, 3}, nil, false, nil, nil, syncFlag, true, true)
+				taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{1, 3, 5}, nil, false, nil, nil, syncFlag, true, true)
 				// taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, partner.GetSingleStoreVendorIDs(), nil, false, nil, nil, syncFlag, true, true)
 
 				errList.AddErr(err2)
@@ -401,6 +401,8 @@ func doDailyWork() {
 	cms.CurVendorSync.SyncStoreSkusFromYb(jxcontext.AdminCtx, nil, true, true)
 	//刷新京东商城订单结算价
 	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102"))
+	//同步京东商城门店库存和商品
+
 }
 
 func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) {
diff --git a/business/model/store.go b/business/model/store.go
index 0a441824a..29180905d 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -423,6 +423,7 @@ type StoreMap struct {
 
 	SyncStatus    int8   `orm:"default(2)" json:"syncStatus"`
 	IsSync        int8   `orm:"default(1)" json:"isSync"`        // 是否同步
+	SyncRule      int8   `orm:"default(0)" json:"syncRule"`      //目前用于京东商城晚上的同步规则，0表示关闭，1表示小同步，2表示大同步
 	FakeOpenStart int16  `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
 	FakeOpenStop  int16  `orm:"default(0)" json:"fakeOpenStop"`  // 假开店结束
 	JdStoreLevel  string `orm:"size(32)" json:"jdStoreLevel"`    //京东门店等级

From 0dfe0a28fad6a101ed4651c3f474e0e79bae3b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 14:28:06 +0800
Subject: [PATCH 189/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 2ff307dc0..92ba48952 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -248,7 +248,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		 ORDER BY order_created_at DESC
 		 LIMIT 1  
 	`
-	sqlParams2 := []interface{}{}
+	sqlParams2 := []interface{}{storeID}
 	err = dao.GetRow(db, &order, sql2, sqlParams2)
 	if order != nil {
 		vendorOrderID = order.VendorOrderID

From 13825af0928303be762fba031fa9f7d8b1ccbddd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 14:36:40 +0800
Subject: [PATCH 190/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 92ba48952..9d32267e2 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -3,6 +3,7 @@ package cms
 import (
 	"fmt"
 	"reflect"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -47,6 +48,8 @@ var (
 		"mtpsPrice": true,
 	}
 
+	regexpMsgContentOpID = regexp.MustCompile(`"openid":"(.*?)"`)
+
 	receiveMsgUsersMap = map[string][]string{
 		SendMsgTypeOpenStoreRequest: []string{
 			"石锋",
@@ -227,6 +230,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 	//获取门店信息
 	var (
 		stores        []*model.Store
+		authBinds     []*model.AuthBind
 		order         *model.GoodsOrder
 		storeName     string
 		storeID       int
@@ -241,6 +245,26 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		storeName = stores[0].Name
 		storeID = stores[0].ID
 	}
+	if storeID == 0 {
+		results := regexpMsgContentOpID.FindStringSubmatch(msgContent)
+		if len(results) > 0 {
+			sql3 := `
+				SELECT * FROM auth_bind WHERE auth_id = ? OR auth_id2 = ? 
+			`
+			sqlParams3 := []interface{}{results[1]}
+			err = dao.GetRows(db, &authBinds, sql3, sqlParams3)
+			if len(authBinds) > 0 {
+				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
+				mobileNum = *user.Mobile
+				sqlParams4 := []interface{}{mobileNum}
+				err = dao.GetRows(db, &stores, sql, sqlParams4)
+				if len(stores) > 0 {
+					storeName = stores[0].Name
+					storeID = stores[0].ID
+				}
+			}
+		}
+	}
 	sql2 := `
 		SELECT * 
 		  FROM goods_order 

From 18128e9433702c38a5c4de407662776e851aeaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 14:57:16 +0800
Subject: [PATCH 191/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go  | 13 ++++++++-----
 business/jxstore/cms/sync.go |  7 ++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 9d32267e2..95007968a 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -57,9 +57,9 @@ var (
 			// "周扬",
 		},
 		SendMsgTypeSuggestRequest: []string{
-			"石锋",
+			// "石锋",
 			// "x",
-			// "周扬",
+			"周扬",
 		},
 	}
 	needConfirmRequestMap = map[string]int{
@@ -237,9 +237,9 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		vendorOrderID string
 	)
 	sql := `
-		SELECT * FROM store WHERE tel1 = ? OR tel2 = ? 
+		SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
 	`
-	sqlParams := []interface{}{mobileNum}
+	sqlParams := []interface{}{mobileNum, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	if len(stores) > 0 {
 		storeName = stores[0].Name
@@ -256,7 +256,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			if len(authBinds) > 0 {
 				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
 				mobileNum = *user.Mobile
-				sqlParams4 := []interface{}{mobileNum}
+				sqlParams4 := []interface{}{mobileNum, utils.DefaultTimeValue}
 				err = dao.GetRows(db, &stores, sql, sqlParams4)
 				if len(stores) > 0 {
 					storeName = stores[0].Name
@@ -277,6 +277,9 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 	if order != nil {
 		vendorOrderID = order.VendorOrderID
 	}
+	if storeID == 0 {
+		vendorOrderID = ""
+	}
 	msgContent = msgContent + " 门店名称：" + storeName + " 门店ID：" + utils.Int2Str(storeID) + " 最新订单号：" + vendorOrderID
 	for _, v := range receiveMsgUsersMap[msgType] {
 		user, err2 := dao.GetUserByID(db, "name", v)
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index b88003ab0..ff44b092f 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1101,7 +1101,7 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, v
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						storeMap := batchItemList[0].(*model.StoreMap)
 						if storeMap.Status > model.StoreStatusDisabled && storeMap.StoreID != model.JdShopMainStoreID && storeMap.SyncRule != 0 {
-							err = syncJdsStoresSkus(ctx, db, storeMap)
+							err = syncJdsStoresSkus(ctx, db, task, storeMap)
 						}
 						return nil, err
 					}, loopMapInfo.StoreMapList)
@@ -1113,7 +1113,7 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, v
 	return hint, err
 }
 
-func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, storeMap *model.StoreMap) (err error) {
+func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap) (err error) {
 	var (
 		mainSkusMap = make(map[int]*model.StoreSkuBind)
 	)
@@ -1126,10 +1126,11 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, storeMap *model.St
 		if mainSkusMap[v.SkuID] != nil {
 
 		} else {
-			if storeMap.SyncRule == 1 {
+			if storeMap.SyncRule == 2 {
 
 			}
 		}
 	}
+
 	return err
 }

From 2b33056ac44805090ba5a80e3f192d2404366816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:05:59 +0800
Subject: [PATCH 192/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 95007968a..2d4e87a66 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -265,6 +265,8 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			}
 		}
 	}
+	fmt.Println("test1", mobileNum)
+	fmt.Println(storeID, storeName)
 	sql2 := `
 		SELECT * 
 		  FROM goods_order 

From d1cf9e68d2f0eb26e78dd546f864e995163177f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:07:13 +0800
Subject: [PATCH 193/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 2d4e87a66..421c0d4d7 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -236,12 +236,14 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		storeID       int
 		vendorOrderID string
 	)
+	fmt.Println("test1", mobileNum)
 	sql := `
 		SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
 	`
 	sqlParams := []interface{}{mobileNum, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	if len(stores) > 0 {
+		fmt.Println(utils.Format4Output(stores, false))
 		storeName = stores[0].Name
 		storeID = stores[0].ID
 	}
@@ -265,8 +267,6 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			}
 		}
 	}
-	fmt.Println("test1", mobileNum)
-	fmt.Println(storeID, storeName)
 	sql2 := `
 		SELECT * 
 		  FROM goods_order 

From 0cf3377c7c045f09cc0c4966bdfa0dda0cdf2cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:13:22 +0800
Subject: [PATCH 194/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 421c0d4d7..42401a880 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -242,8 +242,9 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 	`
 	sqlParams := []interface{}{mobileNum, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
+	fmt.Println("test1", sql)
+	fmt.Println("test1", sqlParams)
 	if len(stores) > 0 {
-		fmt.Println(utils.Format4Output(stores, false))
 		storeName = stores[0].Name
 		storeID = stores[0].ID
 	}

From 8977984d16a6bee40d5de0ab380e9d1c2e8d97cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:15:51 +0800
Subject: [PATCH 195/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 42401a880..4992dbaef 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -236,14 +236,11 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		storeID       int
 		vendorOrderID string
 	)
-	fmt.Println("test1", mobileNum)
 	sql := `
 		SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
 	`
-	sqlParams := []interface{}{mobileNum, utils.DefaultTimeValue}
+	sqlParams := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
-	fmt.Println("test1", sql)
-	fmt.Println("test1", sqlParams)
 	if len(stores) > 0 {
 		storeName = stores[0].Name
 		storeID = stores[0].ID
@@ -254,7 +251,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			sql3 := `
 				SELECT * FROM auth_bind WHERE auth_id = ? OR auth_id2 = ? 
 			`
-			sqlParams3 := []interface{}{results[1]}
+			sqlParams3 := []interface{}{results[1], results[1]}
 			err = dao.GetRows(db, &authBinds, sql3, sqlParams3)
 			if len(authBinds) > 0 {
 				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)

From aeeb9dad40a0937cfc74ed14d0454bff6b5c02e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:38:27 +0800
Subject: [PATCH 196/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 6afea2a48..b3458fe49 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
@@ -20,6 +21,9 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 	// storeDetail.VendorStoreID = vendorStoreID
 	// storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus)
 	result2, err := api.JdShopAPI.QueryEntityStore(utils.Str2Int64(vendorStoreID))
+	if result2 == nil {
+		return storeDetail, fmt.Errorf("未查询到该平台门店，平台门店ID：[%v]", vendorStoreID)
+	}
 	storeDetail.ID = utils.Str2Int(result2.ExStoreID)
 	storeDetail.Name = result2.StoreName
 	storeDetail.Address = result2.Address

From d821831a4a73394dcc90da04dc9f3fb0a8251382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:46:39 +0800
Subject: [PATCH 197/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 974537b6d..9afec7727 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1186,6 +1186,8 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 					}
 					err = nil
 					storeMap.SyncStatus = model.SyncFlagModifiedMask | model.SyncFlagStoreName | model.SyncFlagStoreAddress
+				} else {
+					return nil, err
 				}
 			} else {
 				err = ErrCanNotFindVendor

From eed2d709a824c8078abd9dd69c46934d815f4f9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:50:02 +0800
Subject: [PATCH 198/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 4992dbaef..534f22e75 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -256,7 +256,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			if len(authBinds) > 0 {
 				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
 				mobileNum = *user.Mobile
-				sqlParams4 := []interface{}{mobileNum, utils.DefaultTimeValue}
+				sqlParams4 := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
 				err = dao.GetRows(db, &stores, sql, sqlParams4)
 				if len(stores) > 0 {
 					storeName = stores[0].Name

From 5893d14d9ec8a452d0205f39ef2d3959dd2253c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:55:59 +0800
Subject: [PATCH 199/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go   | 1 +
 business/jxstore/cms/store.go | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 534f22e75..6f93c4fe4 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -60,6 +60,7 @@ var (
 			// "石锋",
 			// "x",
 			"周扬",
+			"苏尹岚"
 		},
 	}
 	needConfirmRequestMap = map[string]int{
diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 9afec7727..9d72a623a 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1176,6 +1176,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		}
 	} else if vendorID == model.VendorIDJDShop {
 		if storeMap.VendorStoreID == "" {
+			fmt.Println("testadd")
 			storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
 		} else {
 			if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
@@ -1198,6 +1199,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	if len(storeMapList) > 0 {
 		_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 	} else {
+		fmt.Println("testadd2")
 		if err == nil {
 			dao.WrapAddIDCULDEntity(storeMap, userName)
 			if db == nil {

From 139609bc099966ae1ee6f829040eba3bd9e1962a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 15:56:22 +0800
Subject: [PATCH 200/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 6f93c4fe4..b67c216c1 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -60,7 +60,7 @@ var (
 			// "石锋",
 			// "x",
 			"周扬",
-			"苏尹岚"
+			"苏尹岚",
 		},
 	}
 	needConfirmRequestMap = map[string]int{

From 5327a66e4f9601c22e91f54bf491d796458ef2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 21 May 2020 16:10:30 +0800
Subject: [PATCH 201/285] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BB=BA=E8=AE=AE?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 42 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index b67c216c1..062f43d20 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -237,16 +237,37 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		storeID       int
 		vendorOrderID string
 	)
-	sql := `
+	if mobileNum != "" {
+		sql := `
 		SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
 	`
-	sqlParams := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
-	err = dao.GetRows(db, &stores, sql, sqlParams)
-	if len(stores) > 0 {
-		storeName = stores[0].Name
-		storeID = stores[0].ID
-	}
-	if storeID == 0 {
+		sqlParams := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
+		err = dao.GetRows(db, &stores, sql, sqlParams)
+		if len(stores) > 0 {
+			storeName = stores[0].Name
+			storeID = stores[0].ID
+		}
+		if storeID == 0 {
+			results := regexpMsgContentOpID.FindStringSubmatch(msgContent)
+			if len(results) > 0 {
+				sql3 := `
+				SELECT * FROM auth_bind WHERE auth_id = ? OR auth_id2 = ? 
+			`
+				sqlParams3 := []interface{}{results[1], results[1]}
+				err = dao.GetRows(db, &authBinds, sql3, sqlParams3)
+				if len(authBinds) > 0 {
+					user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
+					mobileNum = *user.Mobile
+					sqlParams4 := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
+					err = dao.GetRows(db, &stores, sql, sqlParams4)
+					if len(stores) > 0 {
+						storeName = stores[0].Name
+						storeID = stores[0].ID
+					}
+				}
+			}
+		}
+	} else {
 		results := regexpMsgContentOpID.FindStringSubmatch(msgContent)
 		if len(results) > 0 {
 			sql3 := `
@@ -257,8 +278,11 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			if len(authBinds) > 0 {
 				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
 				mobileNum = *user.Mobile
+				sql4 := `
+					SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
+				`
 				sqlParams4 := []interface{}{mobileNum, mobileNum, utils.DefaultTimeValue}
-				err = dao.GetRows(db, &stores, sql, sqlParams4)
+				err = dao.GetRows(db, &stores, sql4, sqlParams4)
 				if len(stores) > 0 {
 					storeName = stores[0].Name
 					storeID = stores[0].ID

From afff23c37d3fa791d6a446c36509c7d1be2e6eac Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Thu, 21 May 2020 19:55:54 +0800
Subject: [PATCH 202/285] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=8A=A0=E4=B8=8A?=
 =?UTF-8?q?=E7=9F=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/cms.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 062f43d20..80c4bd5a1 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -57,7 +57,7 @@ var (
 			// "周扬",
 		},
 		SendMsgTypeSuggestRequest: []string{
-			// "石锋",
+			"石锋",
 			// "x",
 			"周扬",
 			"苏尹岚",

From 4eea870713cf1516dcaac2dbb54ad5cb5a7e4141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 08:39:56 +0800
Subject: [PATCH 203/285] =?UTF-8?q?=E7=BE=8E=E5=9B=A2=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E8=87=AA=E5=8A=A8=E5=90=8C=E6=84=8F=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=95=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jxcallback/scheduler/defsch/defsch.go     |  7 +++-
 business/jxutils/weixinmsg/weixinmsg.go       | 38 +++++++++++++++++++
 business/model/dao/dao_order.go               | 11 ++++++
 business/partner/purchase/mtwm/order.go       | 10 ++++-
 4 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 750a63555..1a3df3005 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -1358,7 +1358,12 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 		utils.CallFuncAsync(func() {
 			order = setFakeActualPayPrice(order)
 			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
-			weixinmsg.NotifyNewOrder(order)
+			//目前暂且认为AdjustCount > 0 就是调整单
+			if order.AdjustCount > 0 {
+				weixinmsg.NotifyAdjustOrder(order)
+			} else {
+				weixinmsg.NotifyNewOrder(order)
+			}
 			smsmsg.NotifyNewOrder(order)
 			OrderProfitWarning(order)
 			smsmsg.NotifyNewUserOrder(order)
diff --git a/business/jxutils/weixinmsg/weixinmsg.go b/business/jxutils/weixinmsg/weixinmsg.go
index 306dd8fb0..87795f53d 100644
--- a/business/jxutils/weixinmsg/weixinmsg.go
+++ b/business/jxutils/weixinmsg/weixinmsg.go
@@ -44,6 +44,7 @@ const (
 	WX_TEMPLATE_VENDERCOLOR_BAD_COMMENTS = "#4F4DA0"
 
 	WX_NEWORDER_TEMPLATE_ID                = "_DtNGwmOeR6TkkTVUblxLIlkV2MAPOX57TkvfdqG6nY" //微信新订单推送
+	WX_ADJUSTORDER_TEMPLATE_ID             = "N5rmV2-PDf3opjkv23IdLc76VnFThr_uOKSh5FzT13M" //微信调整订单推送
 	WX_MTPS_DELIVERY_GRABDONE_TEMPLATE_ID  = "h4dkON6AgnHz1XmaksEUB_8Bcir4V8MSexUhC149pPE" //微信美团配送员接单推送
 	WX_MTPS_DELIVERY_DONE_TEMPLATE_ID      = "YXdCrQAHZlcZX1htYUiarrLmtkmKAjp7rynjwObgODo" //微信美团配送员配送完成推送
 	WX_MTPS_UNABLE_DELIVER_TEMPLATE_ID     = "ZFph5Hp7oLlrzVRXbsKIC_StmaBeB9Dlp4tlHeAmUQ8" //微信美团配送配送能力不足推送
@@ -718,3 +719,40 @@ func SendStoreMessage(ctx *jxcontext.Context, title, content string, storeIDs []
 	}
 	return "", err
 }
+
+func NotifyAdjustOrder(order *model.GoodsOrder) (err error) {
+	globals.SugarLogger.Debugf("NotifyAdjustOrder orderID:%s", order.VendorOrderID)
+	if order.VendorID == model.VendorIDELM {
+		return nil
+	}
+
+	if !model.IsOrderSolid(order) {
+		globals.SugarLogger.Infof("NotifyAdjustOrder orderID:%s is not solid", order.VendorOrderID)
+		return nil
+	}
+	sb := new(strings.Builder)
+	sb.WriteString("老板，")
+	sb.WriteString(order.ConsigneeName)
+	sb.WriteString("调整了订单商品，请及时查看！")
+	sb.WriteString(getOrderDetailBrief(order))
+	data := map[string]interface{}{
+		"first": map[string]interface{}{
+			"value": sb.String(),
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"keyword1": map[string]interface{}{
+			"value": jxutils.IntPrice2Standard(order.NewEarningPrice),
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"keyword2": map[string]interface{}{
+			"value": utils.Time2Str(order.CreatedAt),
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+		"keyword3": map[string]interface{}{
+			"value": model.OrderStatusName[order.Status],
+			"color": WX_NEW_ORDER_TEMPLATE_COLOR,
+		},
+	}
+	storeID := jxutils.GetSaleStoreIDFromOrder(order)
+	return SendMsgToStore(storeID, WX_ADJUSTORDER_TEMPLATE_ID, globals.WxBackstageHost+fmt.Sprintf("%s%d", WX_TO_ORDER_PAGE_URL, storeID), WX_MINI_TO_ORDER_PAGE_URL, data)
+}
diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go
index 0f94c9f07..fc8994645 100644
--- a/business/model/dao/dao_order.go
+++ b/business/model/dao/dao_order.go
@@ -1270,3 +1270,14 @@ func GetMatterChildOrders(db *DaoDB, vendorOrderID string) (goods []*model.Goods
 	err = GetRows(db, &goods, sql, sqlParams)
 	return goods, err
 }
+
+func GetSimpleOrder(db *DaoDB, vendorOrderID string) (goods *model.GoodsOrder, err error) {
+	sql := `
+		SELECT * 
+		  FROM goods_order
+		 WHERE vendor_order_id = ? 
+	`
+	sqlParams := []interface{}{vendorOrderID}
+	err = GetRow(db, &goods, sql, sqlParams)
+	return goods, err
+}
diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go
index 06e8fff29..71f6e81c9 100644
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -396,8 +396,14 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *mtwmapi.CallbackMsg) (orderSta
 			if msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
 				if notifyType == mtwmapi.NotifyTypePartyApply {
 					if globals.EnableMtwmStoreWrite {
-						// api.MtwmAPI.OrderRefundReject(utils.Str2Int64(orderID), "请联系商户，让商户发起订单调整") // todo 京东与饿百都没有售前用户提出订单调整的，自动拒绝调整单
-						api.MtwmAPI.OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款")
+						goods, err := dao.GetSimpleOrder(dao.GetDB(), orderID)
+						if err == nil {
+							if goods.Status < model.OrderStatusDelivering {
+								api.MtwmAPI.OrderRefundAgree(utils.Str2Int64(orderID), "自动确认退款")
+							} else {
+								api.MtwmAPI.OrderRefundReject(utils.Str2Int64(orderID), "商品配送中，请联系门店。") // todo 京东与饿百都没有售前用户提出订单调整的，自动拒绝调整单
+							}
+						}
 					}
 				} else if notifyType == mtwmapi.NotifyTypeSuccess {
 					vendorStatus = fakeOrderAdjustFinished

From f74b24c83c842282f404e3e616c667907b4088de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 08:45:13 +0800
Subject: [PATCH 204/285] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 9d72a623a..50b7a07a7 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1224,7 +1224,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	if vendorID == model.VendorIDJDShop {
 		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
 		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
-		if _, err = SetStoreSkuSyncStatus2(db, nil, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
+		if _, err = SetStoreSkuSyncStatus2(db, []int{storeID}, []int{model.VendorIDJDShop}, findSkusBetweenJdsMainStore(db, storeID), model.SyncFlagSaleMask); err == nil {
 			// CurVendorSync.SyncStoresSkus(ctx, nil, 0, db, nil, []int{storeID}, nil, false, true, true)
 		}
 	}

From 1fa96214316111f7db6956ead77e6ba7fccaf198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 08:50:12 +0800
Subject: [PATCH 205/285] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 50b7a07a7..ffa5fbcfa 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1176,7 +1176,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 		}
 	} else if vendorID == model.VendorIDJDShop {
 		if storeMap.VendorStoreID == "" {
-			fmt.Println("testadd")
 			storeMap.SyncStatus = model.SyncFlagNewMask //京东商城要去建店
 		} else {
 			if handler := CurVendorSync.GetStoreHandler(vendorID); handler != nil {
@@ -1199,7 +1198,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 	if len(storeMapList) > 0 {
 		_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 	} else {
-		fmt.Println("testadd2")
 		if err == nil {
 			dao.WrapAddIDCULDEntity(storeMap, userName)
 			if db == nil {
@@ -1212,9 +1210,11 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 					panic(r)
 				}
 			}()
+			fmt.Println("test111")
 			if err = dao.CreateEntity(db, storeMap); err == nil {
 				dao.Commit(db)
 				outStoreMap = storeMap
+				fmt.Println("test222")
 				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 			} else {
 				dao.Rollback(db)
@@ -3174,6 +3174,5 @@ func findSkusBetweenJdsMainStore(db *dao.DaoDB, storeID int) (skus []int) {
 			skus = append(skus, v.SkuID)
 		}
 	}
-	fmt.Println("testskus", skus)
 	return skus
 }

From 965a97dd5adb730d0423ff636e62a8bf9629269e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 08:59:34 +0800
Subject: [PATCH 206/285] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ffa5fbcfa..0eae6ea83 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1210,13 +1210,12 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 					panic(r)
 				}
 			}()
-			fmt.Println("test111")
 			if err = dao.CreateEntity(db, storeMap); err == nil {
 				dao.Commit(db)
 				outStoreMap = storeMap
-				fmt.Println("test222")
 				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 			} else {
+				fmt.Println(err.Error())
 				dao.Rollback(db)
 			}
 		}

From 17f36d84595022500083472b1e1b8f31a5105cb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 09:13:02 +0800
Subject: [PATCH 207/285] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E4=B8=8A=E5=B1=82=E9=97=A8=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index b3458fe49..d90e0a4b6 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -24,6 +24,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 	if result2 == nil {
 		return storeDetail, fmt.Errorf("未查询到该平台门店，平台门店ID：[%v]", vendorStoreID)
 	}
+	storeDetail = &dao.StoreDetail{}
 	storeDetail.ID = utils.Str2Int(result2.ExStoreID)
 	storeDetail.Name = result2.StoreName
 	storeDetail.Address = result2.Address

From a5b7162b232866d755455738ca5189988feda6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 10:58:16 +0800
Subject: [PATCH 208/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBcookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go  | 100 ++++++++++++++++++++++++++++++----
 business/jxstore/misc/misc.go |   8 +--
 controllers/cms_sync.go       |  13 +++++
 globals/api/api.go            |   6 +-
 4 files changed, 110 insertions(+), 17 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index ff44b092f..21def0ef1 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1084,7 +1084,7 @@ func syncStoreSkusFromYb(ctx *jxcontext.Context, storeID, vendorID int, vendorSt
 	return hint, err
 }
 
-func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, vendorStoreID string, isAsync, isContinueWhenError bool) (hint string, err error) {
+func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
 		db = dao.GetDB()
 	)
@@ -1101,7 +1101,7 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, v
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						storeMap := batchItemList[0].(*model.StoreMap)
 						if storeMap.Status > model.StoreStatusDisabled && storeMap.StoreID != model.JdShopMainStoreID && storeMap.SyncRule != 0 {
-							err = syncJdsStoresSkus(ctx, db, task, storeMap)
+							_, err = syncJdsStoresSkus(ctx, db, task, storeMap, isAsync, isContinueWhenError)
 						}
 						return nil, err
 					}, loopMapInfo.StoreMapList)
@@ -1113,9 +1113,16 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, v
 	return hint, err
 }
 
-func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap) (err error) {
+func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
-		mainSkusMap = make(map[int]*model.StoreSkuBind)
+		mainSkusMap      = make(map[int]*model.StoreSkuBind)
+		skusMap          = make(map[int]*model.StoreSkuBind)
+		updateList       []*model.StoreSkuBind
+		addList          []*model.StoreSkuBind
+		skuBindInfos1    []*StoreSkuBindInfo
+		skuBindInfos2    []*StoreSkuBindInfo
+		resultInterface1 []interface{}
+		resultInterface2 []interface{}
 	)
 	storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
 	for _, v := range storeSkusMain {
@@ -1123,14 +1130,87 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 	}
 	storeSkus, err := dao.GetStoresSkusInfo(db, []int{storeMap.StoreID}, nil)
 	for _, v := range storeSkus {
-		if mainSkusMap[v.SkuID] != nil {
-
-		} else {
+		skusMap[v.SkuID] = v
+		if mainSkusMap[v.SkuID] != nil && mainSkusMap[v.SkuID].Status != v.Status {
+			updateList = append(updateList, mainSkusMap[v.SkuID])
+		}
+	}
+	for k, v := range mainSkusMap {
+		if skusMap[k] == nil {
 			if storeMap.SyncRule == 2 {
-
+				addList = append(addList, v)
 			}
 		}
 	}
-
-	return err
+	task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+		func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			step := batchItemList[0].(int)
+			switch step {
+			case 0:
+				if len(updateList) > 0 {
+					task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+							storeBind := batchItemList[0].(*model.StoreSkuBind)
+							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
+							return retVal, err
+						}, updateList)
+					tasksch.HandleTask(task, ptTask, false).Run()
+					resultInterface1, err = task.GetResult(0)
+					for _, v := range resultInterface1 {
+						skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
+					}
+					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
+				}
+			case 1:
+				if len(addList) > 0 {
+					task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+							storeBind := batchItemList[0].(*model.StoreSkuBind)
+							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
+							return retVal, err
+						}, addList)
+					tasksch.HandleTask(task, ptTask, false).Run()
+					resultInterface2, err = task.GetResult(0)
+					for _, v := range resultInterface2 {
+						skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
+					}
+					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
+				}
+			}
+			return retVal, err
+		}, []int{0, 1})
+	tasksch.HandleTask(task, nil, true).Run()
+	if isAsync {
+		hint = task.GetID()
+	} else {
+		_, err = task.GetResult(0)
+		hint = "1"
+	}
+	return hint, err
+}
+
+func buildStoreSkuBindInfo(db *dao.DaoDB, storeID int, storeBind *model.StoreSkuBind, isFocus bool) (skuBindInfo *StoreSkuBindInfo) {
+	result, err := dao.GetSkus(db, []int{storeBind.SkuID}, nil, nil, nil, nil)
+	if err != nil || len(result) == 0 {
+		return nil
+	}
+	skus := []*StoreSkuBindSkuInfo{
+		&StoreSkuBindSkuInfo{
+			SkuID: storeBind.SkuID,
+		},
+	}
+	skuBindInfo = &StoreSkuBindInfo{
+		StoreID: storeID,
+		NameID:  result[0].NameID,
+	}
+	if isFocus {
+		skuBindInfo.IsFocus = 1
+	}
+	if storeBind.Status == model.SkuStatusNormal {
+		skus[0].IsSale = 1
+	} else {
+		skus[0].IsSale = -1
+	}
+	skuBindInfo.Skus = skus
+	return skuBindInfo
 }
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index ea2bf20e9..a9574af87 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -295,10 +295,10 @@ func Init() {
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "feiePageCookie", model.ConfigTypeCookie, ""); err == nil {
 		feiePageCookie = configs[0].Value
 	}
-	// if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
-	// 	jdsCookie = configs[0].Value
-	// 	api.JdShopAPI.SetCookieWithStr(jdsCookie)
-	// }
+	if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie", model.ConfigTypeCookie, ""); err == nil {
+		jdsCookie = configs[0].Value
+		api.JdShopAPI.SetCookieWithStr(jdsCookie)
+	}
 	if configs, err := dao.QueryConfigs(dao.GetDB(), "yinbaoCookie", model.ConfigTypeCookie, ""); err == nil {
 		yinbaoCookie := configs[0].Value
 		api.YinBaoAPI.SetCookie(".POSPALAUTH30220", yinbaoCookie)
diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go
index 4cdba082e..5a01cec7a 100644
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -366,3 +366,16 @@ func (c *SyncController) SyncStoreSkusFromYb() {
 		return retVal, "", err
 	})
 }
+
+// @Title 同步京东商城门店商品和库存
+// @Description 同步京东商城门店商品和库存
+// @Param	token				header		string	true	"认证token"
+// @Param	storeIDs			formData	string	false	"门店ID列表"
+// @Param	isAsync				formData	bool	false	"是否异步操作"
+// @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /SyncJdsStoresSkus [put]
+func (c *SyncController) SyncJdsStoresSkus() {
+
+}
diff --git a/globals/api/api.go b/globals/api/api.go
index 1b876630e..1cc86b19f 100644
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -123,9 +123,9 @@ func Init() {
 	}
 	if !beego.AppConfig.DefaultBool("disableJdShop", false) {
 		JdShopAPI = jdshopapi.New(beego.AppConfig.String("jdShopAccessToken"), beego.AppConfig.String("jdShopAppKey"), beego.AppConfig.String("jdShopAppSecret"))
-		if jdsCookie := beego.AppConfig.DefaultString("jdsCookie", ""); jdsCookie != "" {
-			JdShopAPI.SetCookieWithStr(jdsCookie)
-		}
+		// if jdsCookie := beego.AppConfig.DefaultString("jdsCookie", ""); jdsCookie != "" {
+		// 	JdShopAPI.SetCookieWithStr(jdsCookie)
+		// }
 	} else {
 		JdShopAPI = nil
 	}

From b572bcb28b0337adbcb4e84696df139c9009a677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 11:17:33 +0800
Subject: [PATCH 209/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=86=E7=B1=BBcookie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 0eae6ea83..ebc0eecdc 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1215,7 +1215,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 				outStoreMap = storeMap
 				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 			} else {
-				fmt.Println(err.Error())
+				fmt.Println("test1", err.Error())
 				dao.Rollback(db)
 			}
 		}

From a952ce7eb5d429f05ac2a6b5e1c1558e39c73817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 11:38:03 +0800
Subject: [PATCH 210/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store_sku.go               |  5 +++--
 business/partner/purchase/jdshop/store_sku.go | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index c67eacea7..3599c6ed9 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -92,8 +92,8 @@ type StoreSkuSyncInfo struct {
 	Img2    string
 	DescImg string
 
-	VendorVendorCatID int64 `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
-
+	VendorVendorCatID int64  `orm:"column(vendor_vendor_cat_id)"` // 平台商品分类（叶子结点）
+	CategoryName      string `json:"categoryName"`                //分类名
 	// sku的商家分类信息
 	SkuCatSyncStatus int8
 	SkuVendorCatID   string `orm:"column(sku_vendor_cat_id)"`
@@ -406,6 +406,7 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	IF(t12.%s <> '', t12.%s, t3.img2) img2,
 	IF(t13.%s <> '', t13.%s, t3.desc_img) desc_img,
 	t4.%s_category_id vendor_vendor_cat_id,
+	t4.name category_name,
 	ts.name store_name`
 	fmtParams := []interface{}{
 		skuVendorIDField, fieldPrefix, fieldPrefix, fieldPrefix,
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d208a47c0..ab3f1e6a7 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -229,6 +229,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 		for _, v := range result {
 			if v.Name == storeCat.Name {
 				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+				break
 			}
 		}
 	}
@@ -366,13 +367,24 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {
 	var (
-		images []*jdshopapi.CreateSkuParamImages
-		// desc   string
+		images      []*jdshopapi.CreateSkuParamImages
+		vendorCatID int
 	)
+	if storeSku.VendorCatID == "" {
+		resultCat, _ := api.JdShopAPI.FindShopCategories()
+		for _, v := range resultCat {
+			if v.Name == storeSku.CategoryName {
+				vendorCatID = int(v.CID)
+				break
+			}
+		}
+	} else {
+		vendorCatID = utils.Str2Int(storeSku.VendorCatID)
+	}
 	name := filterSensitiveWord(storeSku.Name)
 	createSkuParamWare = &jdshopapi.CreateSkuParamWare{
 		Title:         name,
-		ShopCategorys: []int{utils.Str2Int(storeSku.VendorCatID)},
+		ShopCategorys: []int{vendorCatID},
 		CategoryID:    int(storeSku.VendorVendorCatID),
 		BrandID:       jdshopapi.JxBrandId,
 		// TransportID:   jdshopapi.TransportID,

From bc97ade75f63f0672374acab781cf4dd06d09d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 13:34:47 +0800
Subject: [PATCH 211/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go         | 4 +++-
 controllers/cms_sync.go               | 8 +++++++-
 routers/commentsRouter_controllers.go | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index ebc0eecdc..0e9f16baf 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1215,11 +1215,13 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 				outStoreMap = storeMap
 				_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
 			} else {
-				fmt.Println("test1", err.Error())
 				dao.Rollback(db)
 			}
 		}
 	}
+	if err != nil {
+		return outStoreMap, err
+	}
 	if vendorID == model.VendorIDJDShop {
 		//绑定京东商城后，需要对绑定的门店现有的和模板店相同且可售的商品设置京东商城的门店库存
 		//TODO SyncFlagSaleMask对京东商城来说，修改门店商品状态就是修改库存
diff --git a/controllers/cms_sync.go b/controllers/cms_sync.go
index 5a01cec7a..3b15447e4 100644
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -377,5 +377,11 @@ func (c *SyncController) SyncStoreSkusFromYb() {
 // @Failure 200 {object} controllers.CallResult
 // @router /SyncJdsStoresSkus [put]
 func (c *SyncController) SyncJdsStoresSkus() {
-
+	c.callSyncJdsStoresSkus(func(params *tSyncSyncJdsStoresSkusParams) (retVal interface{}, errCode string, err error) {
+		var storeIDs []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs); err == nil {
+			retVal, err = cms.CurVendorSync.SyncJdsStoresSkus(params.Ctx, storeIDs, params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
 }
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index 1250ecf20..cfbcedf1b 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -2232,6 +2232,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
+        beego.ControllerComments{
+            Method: "SyncJdsStoresSkus",
+            Router: `/SyncJdsStoresSkus`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
         beego.ControllerComments{
             Method: "SyncSkuNames",

From 074f1f25d4762cfa723b3022b738665bd4f527ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 14:28:33 +0800
Subject: [PATCH 212/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 5 +++++
 business/partner/purchase/jdshop/store_sku.go | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 01c27327f..96b6733c7 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4425,3 +4425,8 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
 	}
 	return err
 }
+
+func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
+
+	return err
+}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index ab3f1e6a7..fe91ae42b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -29,7 +29,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 		for _, v := range storeSkuList {
 			//判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品
 			name := filterSensitiveWord(v.Name)
-			result, err := api.JdShopAPI.SearchWare4Valid(name)
+			result, err := api.JdShopAPI.SearchWare4Valid(name, 0, 0)
 			if err != nil {
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 				return failedList, err
@@ -351,7 +351,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	}
 	if isCreate {
 		createShopCategoryParam2.Type = jdshopapi.CreateCatType
-		createShopCategoryParam2.ID = "1"
+		createShopCategoryParam2.ID = "0"
 		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	} else {
 		for _, v := range createShopCategoryParams {

From 50572269d476a22a716093833c235fc4ccc7638a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 14:41:57 +0800
Subject: [PATCH 213/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fe91ae42b..aae36a5fd 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -371,6 +372,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		vendorCatID int
 	)
 	if storeSku.VendorCatID == "" {
+		fmt.Println("testCat", storeSku.VendorCatID)
 		resultCat, _ := api.JdShopAPI.FindShopCategories()
 		for _, v := range resultCat {
 			if v.Name == storeSku.CategoryName {

From 6f3c97061138ae47ce4faed774f2ee31f2a26c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 14:44:55 +0800
Subject: [PATCH 214/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index aae36a5fd..16f7ab26f 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -371,7 +371,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		images      []*jdshopapi.CreateSkuParamImages
 		vendorCatID int
 	)
-	if storeSku.VendorCatID == "" {
+	if storeSku.VendorCatID == "0" {
 		fmt.Println("testCat", storeSku.VendorCatID)
 		resultCat, _ := api.JdShopAPI.FindShopCategories()
 		for _, v := range resultCat {

From 55759851018d9ef8dc1ddcbcaa7780901c4d75c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 14:49:08 +0800
Subject: [PATCH 215/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 16f7ab26f..55d07473c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -372,7 +372,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		vendorCatID int
 	)
 	if storeSku.VendorCatID == "0" {
-		fmt.Println("testCat", storeSku.VendorCatID)
+		fmt.Println("testCat2", utils.Format4Output(storeSku, false))
 		resultCat, _ := api.JdShopAPI.FindShopCategories()
 		for _, v := range resultCat {
 			if v.Name == storeSku.CategoryName {

From e176bd87542aca71044531fd92059dbdce7c0613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 15:07:17 +0800
Subject: [PATCH 216/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             |  1 -
 business/jxstore/cms/sync_store_sku.go        |  1 +
 business/partner/purchase/jdshop/store_sku.go | 55 ++++++++-----------
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 96b6733c7..7626db551 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4427,6 +4427,5 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
 }
 
 func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
-
 	return err
 }
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index c8deeae64..76e611321 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -1397,6 +1397,7 @@ func changeList2Jds(list []*dao.StoreSkuSyncInfo) (rList []*dao.StoreSkuSyncInfo
 		storeSku.Img2 = v[0].Img2
 		storeSku.DescImg = v[0].DescImg
 		storeSku.JdsWareID = v[0].JdsWareID
+		storeSku.CategoryName = v[0].CategoryName
 		rList = append(rList, storeSku)
 	}
 	return rList
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 55d07473c..7b4fc386b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 
@@ -156,7 +155,21 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
 }
 
 func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (skuNameList []*partner.SkuNameInfo, err error) {
-
+	var (
+		pageNo   = 1
+		pageSize = 100
+	)
+	pageResult, err := api.JdShopAPI.SearchWare4Valid("", pageNo, pageSize)
+	for ; pageNo <= pageResult.TotalItem/pageSize+1; pageNo++ {
+		result, err := api.JdShopAPI.SearchWare4Valid("", pageNo, pageSize)
+		if err == nil {
+			for _, v := range result.Data {
+				if skuName := vendorSku2Jx(v); skuName != nil {
+					skuNameList = append(skuNameList, skuName)
+				}
+			}
+		}
+	}
 	return skuNameList, err
 }
 
@@ -286,41 +299,18 @@ func ybSkuStatus2Jx(ybStatus int) (jxSkuStatus int) {
 	return jxSkuStatus
 }
 
-func vendorSku2Jx(result *yinbaoapi.QueryProductByBarcodeResult, resultp []*yinbaoapi.QueryProductImagesByBarcodeResult) (skuName *partner.SkuNameInfo) {
-	var picList []string
+func vendorSku2Jx(result *jdshopapi.SearchWare4ValidResultData) (skuName *partner.SkuNameInfo) {
 	if result == nil {
 		globals.SugarLogger.Warnf("vendorSku2Jx, strange result:%s", utils.Format4Output(result, true))
 		return nil
 	}
-	if len(resultp) > 0 {
-		if resultp[0].ImageURL != "" {
-			// for _, v := range resultp.Productimages {
-			picList = append(picList, resultp[0].ImageURL)
-			// }
-		}
-	}
-	prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(result.Name)
+	// prefix, name, comment, specUnit, unit, specQuality := jxutils.SplitSkuName(result.Title)
 	skuName = &partner.SkuNameInfo{
-		Prefix:    prefix,
-		Name:      name,
-		Unit:      unit,
-		YbBarCode: result.Barcode,
-		SkuList: []*partner.SkuInfo{
-			&partner.SkuInfo{
-				StoreSkuInfo: partner.StoreSkuInfo{
-					VendorSkuID: utils.Int64ToStr(result.UID),
-					Stock:       int(utils.Float64TwoInt64(result.Stock)),
-					VendorPrice: jxutils.StandardPrice2Int(result.SellPrice),
-					Status:      ybSkuStatus2Jx(result.Enable),
-				},
-				SkuName:     result.Name,
-				Comment:     comment,
-				SpecQuality: float64(specQuality),
-				SpecUnit:    specUnit,
-				Weight:      int(utils.Float64TwoInt64(float64(specQuality))),
-			},
-		},
-		PictureList: picList,
+		Name:            result.Title,
+		VendorNameID:    utils.Int64ToStr(result.WareID),
+		Status:          result.WareStatus,
+		VendorCatIDList: []string{utils.Int2Str(result.CategoryID)},
+		NameID:          utils.Str2Int(result.OuterID),
 	}
 	return skuName
 }
@@ -372,7 +362,6 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		vendorCatID int
 	)
 	if storeSku.VendorCatID == "0" {
-		fmt.Println("testCat2", utils.Format4Output(storeSku, false))
 		resultCat, _ := api.JdShopAPI.FindShopCategories()
 		for _, v := range resultCat {
 			if v.Name == storeSku.CategoryName {

From dc7c9d210c72a069484b76a25829604353a73cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 15:37:00 +0800
Subject: [PATCH 217/285] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go |  12 ++++
 business/jxstore/cms/sync.go      | 106 +++++++++++++++---------------
 business/jxstore/misc/misc.go     |   3 +-
 3 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 7626db551..2982e6763 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -13,6 +13,8 @@ import (
 	"time"
 	"unicode"
 
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+
 	"git.rosy.net.cn/jx-callback/globals/api"
 
 	"git.rosy.net.cn/jx-callback/globals/refutil"
@@ -4427,5 +4429,15 @@ func focusC4Matters(ctx *jxcontext.Context, db *dao.DaoDB, v *model.Sku) (err er
 }
 
 func RefreshJdsSkusStatus(ctx *jxcontext.Context) (err error) {
+	handler := partner.GetPurchasePlatformFromVendorID(model.VendorIDJDShop).(partner.ISingleStoreStoreSkuHandler)
+	remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, nil, 0, "", nil)
+	for _, v := range remoteSkuList {
+		if v.Status == jdshopapi.JdsSkuStatus2 {
+			reason, err := api.JdShopAPI.FindOpReason(utils.Str2Int64(v.VendorNameID))
+			if err == nil && reason == jdshopapi.PassReason {
+				err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorNameID), jdshopapi.JdsSkuStatus1)
+			}
+		}
+	}
 	return err
 }
diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index 21def0ef1..ab5b9a2c1 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1115,14 +1115,14 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 
 func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
-		mainSkusMap      = make(map[int]*model.StoreSkuBind)
-		skusMap          = make(map[int]*model.StoreSkuBind)
-		updateList       []*model.StoreSkuBind
-		addList          []*model.StoreSkuBind
-		skuBindInfos1    []*StoreSkuBindInfo
-		skuBindInfos2    []*StoreSkuBindInfo
-		resultInterface1 []interface{}
-		resultInterface2 []interface{}
+		mainSkusMap = make(map[int]*model.StoreSkuBind)
+		skusMap     = make(map[int]*model.StoreSkuBind)
+		updateList  []*model.StoreSkuBind
+		addList     []*model.StoreSkuBind
+		// skuBindInfos1    []*StoreSkuBindInfo
+		// skuBindInfos2    []*StoreSkuBindInfo
+		// resultInterface1 []interface{}
+		// resultInterface2 []interface{}
 	)
 	storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
 	for _, v := range storeSkusMain {
@@ -1142,50 +1142,52 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 			}
 		}
 	}
-	task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-		func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-			step := batchItemList[0].(int)
-			switch step {
-			case 0:
-				if len(updateList) > 0 {
-					task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-							storeBind := batchItemList[0].(*model.StoreSkuBind)
-							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
-							return retVal, err
-						}, updateList)
-					tasksch.HandleTask(task, ptTask, false).Run()
-					resultInterface1, err = task.GetResult(0)
-					for _, v := range resultInterface1 {
-						skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
-					}
-					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
-				}
-			case 1:
-				if len(addList) > 0 {
-					task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-							storeBind := batchItemList[0].(*model.StoreSkuBind)
-							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
-							return retVal, err
-						}, addList)
-					tasksch.HandleTask(task, ptTask, false).Run()
-					resultInterface2, err = task.GetResult(0)
-					for _, v := range resultInterface2 {
-						skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
-					}
-					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
-				}
-			}
-			return retVal, err
-		}, []int{0, 1})
-	tasksch.HandleTask(task, nil, true).Run()
-	if isAsync {
-		hint = task.GetID()
-	} else {
-		_, err = task.GetResult(0)
-		hint = "1"
-	}
+	fmt.Println("updateList", utils.Format4Output(updateList, false))
+	fmt.Println("addList", utils.Format4Output(addList, false))
+	// task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+	// 	func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 		step := batchItemList[0].(int)
+	// 		switch step {
+	// 		case 0:
+	// 			if len(updateList) > 0 {
+	// 				task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+	// 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 						storeBind := batchItemList[0].(*model.StoreSkuBind)
+	// 						retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
+	// 						return retVal, err
+	// 					}, updateList)
+	// 				tasksch.HandleTask(task, ptTask, false).Run()
+	// 				resultInterface1, err = task.GetResult(0)
+	// 				for _, v := range resultInterface1 {
+	// 					skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
+	// 				}
+	// 				hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
+	// 			}
+	// 		case 1:
+	// 			if len(addList) > 0 {
+	// 				task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+	// 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 						storeBind := batchItemList[0].(*model.StoreSkuBind)
+	// 						retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
+	// 						return retVal, err
+	// 					}, addList)
+	// 				tasksch.HandleTask(task, ptTask, false).Run()
+	// 				resultInterface2, err = task.GetResult(0)
+	// 				for _, v := range resultInterface2 {
+	// 					skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
+	// 				}
+	// 				hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
+	// 			}
+	// 		}
+	// 		return retVal, err
+	// 	}, []int{0, 1})
+	// tasksch.HandleTask(task, nil, true).Run()
+	// if isAsync {
+	// 	hint = task.GetID()
+	// } else {
+	// 	_, err = task.GetResult(0)
+	// 	hint = "1"
+	// }
 	return hint, err
 }
 
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index a9574af87..72e0f41d6 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -402,7 +402,8 @@ func doDailyWork() {
 	//刷新京东商城订单结算价
 	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102"))
 	//同步京东商城门店库存和商品
-
+	//同步上架京东商城待售商品
+	cms.RefreshJdsSkusStatus(jxcontext.AdminCtx)
 }
 
 func RefreshRealMobile(ctx *jxcontext.Context, vendorID int, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) {

From b434f727a8a4238a8846bd5b8f849ae6feb7e384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 16:25:16 +0800
Subject: [PATCH 218/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go         |  1 +
 business/jxstore/cms/cms.go                   |  4 ++--
 business/jxstore/cms/sku.go                   | 11 +++++++++--
 business/jxstore/cms/sync_store_sku.go        |  2 +-
 business/partner/purchase/jdshop/store_sku.go | 10 +++++-----
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index cba833510..93a9c6705 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -401,6 +401,7 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 							earningPrice = int(utils.Float64TwoInt64(math.Round(utils.Int2Float64(int(v.SalePrice)) * utils.Int2Float64(storePayPercentage) / 100)))
 						}
 						v.EarningPrice = int64(earningPrice)
+						// v.StoreSubID = 0
 					}
 					// }
 				}
diff --git a/business/jxstore/cms/cms.go b/business/jxstore/cms/cms.go
index 80c4bd5a1..3a420aa95 100644
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -59,8 +59,8 @@ var (
 		SendMsgTypeSuggestRequest: []string{
 			"石锋",
 			// "x",
-			"周扬",
-			"苏尹岚",
+			// "周扬",
+			// "苏尹岚",
 		},
 	}
 	needConfirmRequestMap = map[string]int{
diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index aecfe564d..c83144623 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1286,11 +1286,10 @@ func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, e
 		return 0, err
 	}
 	dao.Commit(db)
-	if _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), []int{skuID}, model.SyncFlagDeletedMask); err == nil {
-	}
 	if num == 1 {
 		_, err = CurVendorSync.SyncSku(ctx, db, -1, sku.ID, false, false, userName)
 	}
+	err = deleteJdsSku(db, skuID)
 	return num, err
 }
 
@@ -2504,3 +2503,11 @@ func getImgFromNet(db *dao.DaoDB, upc string) (img string) {
 	img = result.Img
 	return img
 }
+
+func deleteJdsSku(db *dao.DaoDB, skuID int) (err error) {
+	storeBinds, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, []int{skuID})
+	if err == nil {
+		err = api.JdShopAPI.DeleteSku(storeBinds[0].JdsID)
+	}
+	return err
+}
diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 76e611321..665b150b1 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -87,7 +87,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
 						storeCatMap.ID = catInfo.MapID
 						var failedList []*partner.StoreSkuInfoWithErr
 						if catInfo.IsExdSpec == model.YES {
-							if vendorID == model.VendorIDJD || vendorID == model.VendorIDMTWM || vendorID == model.VendorIDYB {
+							if vendorID != model.VendorIDEBAI {
 								return nil, err
 							}
 						}
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 7b4fc386b..2eb432d8b 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -141,11 +141,11 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
 		for _, v := range storeSkuList {
-			err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
-			// err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
-			// if err == nil {
-			// 	err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
-			// }
+			// err = api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
+			err = api.JdShopAPI.UpOrDown(utils.Str2Int64(v.VendorSkuID2), 2)
+			if err == nil {
+				err = api.JdShopAPI.DeleteWare(utils.Str2Int(v.VendorSkuID2))
+			}
 		}
 		if err != nil {
 			failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "删除商品")

From 37deafe55e3e5aa71b65b797866a67c63744c568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 16:31:17 +0800
Subject: [PATCH 219/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go       | 1 +
 business/jxstore/cms/store_sku.go | 1 +
 business/model/model.go           | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index c83144623..788bcd094 100644
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -1321,6 +1321,7 @@ func DeleteStoreSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int) (n
 				model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
 				model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask,
 				model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
+				model.FieldJdsSyncStatus:  model.SyncFlagDeletedMask,
 			}, ctx.GetUserName(), map[string]interface{}{
 				model.FieldSkuID:     v.ID,
 				model.FieldDeletedAt: utils.DefaultTimeValue,
diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 2982e6763..93c513e16 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -1134,6 +1134,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									model.FieldEbaiSyncStatus: model.SyncFlagDeletedMask,
 									model.FieldMtwmSyncStatus: model.SyncFlagDeletedMask,
 									model.FieldYbSyncStatus:   model.SyncFlagDeletedMask,
+									model.FieldJdsSyncStatus:  model.SyncFlagDeletedMask,
 								}, userName, nil); err != nil {
 									dao.Rollback(db)
 									return nil, err
diff --git a/business/model/model.go b/business/model/model.go
index 569b7fe41..5621efcfc 100644
--- a/business/model/model.go
+++ b/business/model/model.go
@@ -18,7 +18,8 @@ const (
 	FieldEbaiSyncStatus = "EbaiSyncStatus"
 	FieldMtwmSyncStatus = "MtwmSyncStatus"
 	// FieldWscSyncStatus  = "WscSyncStatus"
-	FieldYbSyncStatus = "YbSyncStatus"
+	FieldYbSyncStatus  = "YbSyncStatus"
+	FieldJdsSyncStatus = "FieldJdsSyncStatus"
 
 	FieldVendorID      = "VendorID"
 	FieldStoreID       = "StoreID"

From 8fc589e2595c8db39621d98e7194f965f109563e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 16:35:27 +0800
Subject: [PATCH 220/285] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=95=86=E5=93=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/model.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/model.go b/business/model/model.go
index 5621efcfc..303eb9fab 100644
--- a/business/model/model.go
+++ b/business/model/model.go
@@ -19,7 +19,7 @@ const (
 	FieldMtwmSyncStatus = "MtwmSyncStatus"
 	// FieldWscSyncStatus  = "WscSyncStatus"
 	FieldYbSyncStatus  = "YbSyncStatus"
-	FieldJdsSyncStatus = "FieldJdsSyncStatus"
+	FieldJdsSyncStatus = "JdsSyncStatus"
 
 	FieldVendorID      = "VendorID"
 	FieldStoreID       = "StoreID"

From 9037a326132eb5f32750c5109952b069ba0b3cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 16:41:27 +0800
Subject: [PATCH 221/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/business/model/sku.go b/business/model/sku.go
index 57b1110ba..0a91336cb 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -69,39 +69,11 @@ var (
 	SkuNamePrefixNames = []string{
 		"新鲜",
 		"组合菜",
-		"冰鲜",
-		"优",
-		"精",
 		"熟食",
-		"鲜",
-		"净菜",
-		"净",
-		"冻",
-		"半熟",
-		"果切",
-		"熟",
-		"优质",
-		"生",
-		"干货",
-		"快捷菜",
-		"手工厨房",
-		"带壳",
-		"长条",
-		"鲜活宰杀",
-		"惠",
+		"鲜活现杀",
 		"冰冻",
-		"思念",
-		"散装",
-		"优质精品",
-		"干",
-		"湿",
-		"生品",
-		"虾仁",
-		"鲜活现宰",
-		"鲜切",
-		"进口",
-		"冰镇",
-		"预售",
+		"净菜",
+		"非熟食",
 	}
 
 	SpecialUnit        = "份"

From 958c068ced52af302925b210d1e3dd57d4d9c5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:04:13 +0800
Subject: [PATCH 222/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 0e9f16baf..f34d39abb 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2514,6 +2514,7 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		var storeList2 []*Store4User
 		for _, v := range storeList1 {
 			distance := jxutils.Point2StoreDistance(lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
+			fmt.Println("test11111", distance)
 			if distance > 0 || (lng == jxutils.IntCoordinate2Standard(v.Lng) && lat == jxutils.IntCoordinate2Standard(v.Lat)) {
 				v.Distance = distance
 				storeList2 = append(storeList2, v)

From 469b16b61f1a9455ccc160dfcd80585408045447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:07:38 +0800
Subject: [PATCH 223/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index f34d39abb..f49e1dc44 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2508,7 +2508,8 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
 		model.YES,
 	}
-
+	fmt.Println(sql)
+	fmt.Println(sqlParams)
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User

From 9b4f0540c2839d0a040e09610db458521dddf447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:16:56 +0800
Subject: [PATCH 224/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index f49e1dc44..36a8ebff2 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2508,14 +2508,12 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
 		model.YES,
 	}
-	fmt.Println(sql)
-	fmt.Println(sqlParams)
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User
 		for _, v := range storeList1 {
 			distance := jxutils.Point2StoreDistance(lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
-			fmt.Println("test11111", distance)
+			fmt.Println("test11111", distance, lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
 			if distance > 0 || (lng == jxutils.IntCoordinate2Standard(v.Lng) && lat == jxutils.IntCoordinate2Standard(v.Lat)) {
 				v.Distance = distance
 				storeList2 = append(storeList2, v)

From 179278757e58b7c30c1d3367f135fa378c31fd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:21:20 +0800
Subject: [PATCH 225/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 36a8ebff2..835a23eb9 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2508,6 +2508,8 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
 		model.YES,
 	}
+	fmt.Println("test22", sqlParams)
+
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User

From fe2d7171314f3736b41430ec0c8e989c59806f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:25:15 +0800
Subject: [PATCH 226/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 835a23eb9..558d67896 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2492,6 +2492,7 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 	_, lat2 := jxutils.ConvertDistanceToLogLat(lng, lat, float64(maxRadius), 0)
 	lng1 := lng - (lng2 - lng)
 	lat1 := lat - (lat2 - lat)
+	fmt.Println("test33", lng1, lng2, lat1, lat2)
 	// globals.SugarLogger.Debugf("%f,%f,%f,%f\n", lng1, lng2, lat1, lat2)
 	sql := `
 	SELECT t1.*,
@@ -2509,7 +2510,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		model.YES,
 	}
 	fmt.Println("test22", sqlParams)
-
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User

From bca3a4e8d926828214eec635b15236019952f170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:39:10 +0800
Subject: [PATCH 227/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index 558d67896..cfd440aa8 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2484,7 +2484,7 @@ func SyncStoresQualify(ctx *jxcontext.Context, storeIDs []int, isAsync, isContin
 
 func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDistance bool) (storeList []*Store4User, err error) {
 	const (
-		maxRadius          = 5000
+		maxRadius          = 8000
 		maxStoreCount4User = 5
 	)
 

From 7c4c652e5a6f22568fe89e6f6167580df6a2f1f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 17:51:42 +0800
Subject: [PATCH 228/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store.go                |  3 ---
 business/partner/purchase/mtwm/store_sku2.go | 14 +++++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go
index cfd440aa8..b32cdd699 100644
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -2492,7 +2492,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 	_, lat2 := jxutils.ConvertDistanceToLogLat(lng, lat, float64(maxRadius), 0)
 	lng1 := lng - (lng2 - lng)
 	lat1 := lat - (lat2 - lat)
-	fmt.Println("test33", lng1, lng2, lat1, lat2)
 	// globals.SugarLogger.Debugf("%f,%f,%f,%f\n", lng1, lng2, lat1, lat2)
 	sql := `
 	SELECT t1.*,
@@ -2509,13 +2508,11 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, needWalkDi
 		utils.DefaultTimeValue, model.StoreStatusDisabled, jxutils.StandardCoordinate2Int(lng1), jxutils.StandardCoordinate2Int(lng2), jxutils.StandardCoordinate2Int(lat1), jxutils.StandardCoordinate2Int(lat2),
 		model.YES,
 	}
-	fmt.Println("test22", sqlParams)
 	var storeList1 []*Store4User
 	if err = dao.GetRows(dao.GetDB(), &storeList1, sql, sqlParams...); err == nil {
 		var storeList2 []*Store4User
 		for _, v := range storeList1 {
 			distance := jxutils.Point2StoreDistance(lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
-			fmt.Println("test11111", distance, lng, lat, v.Lng, v.Lat, v.DeliveryRangeType, v.DeliveryRange)
 			if distance > 0 || (lng == jxutils.IntCoordinate2Standard(v.Lng) && lat == jxutils.IntCoordinate2Standard(v.Lat)) {
 				v.Distance = distance
 				storeList2 = append(storeList2, v)
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 4cc9ea279..a1e95fee9 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -246,7 +246,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		syncType = "更新商品"
 	}
 	for i, storeSku := range storeSkuList {
-		isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
+		// isNeedUpdatePrice := isCreate //storeSku.SkuSyncStatus&( model.SyncFlagPriceMask| model.SyncFlagNewMask) != 0
 		foodData := make(map[string]interface{})
 		foodDataList[i] = foodData
 		foodData[mtwmapi.KeyAppFoodCode] = utils.Int2Str(storeSku.SkuID)
@@ -258,9 +258,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		foodData["skus"] = skus
 		foodData["name"] = utils.LimitUTF8StringLen(utils.FilterEmoji(storeSku.SkuName), mtwmapi.MaxSkuNameCharCount)
 		foodData["description"] = storeSku.Comment
-		if isNeedUpdatePrice {
-			foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
-		}
+		// if isNeedUpdatePrice {
+		foodData["price"] = jxutils.IntPrice2Standard(storeSku.VendorPrice)
+		// }
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
 		foodData["box_num"] = 1
@@ -291,9 +291,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 			// foodData["tag_id"] = utils.Int64ToStr(defVendorCatID)
 		}
 		skus[0]["spec"] = jxutils.ComposeSkuSpec(storeSku.SpecQuality, storeSku.SpecUnit)
-		if isNeedUpdatePrice {
-			skus[0]["price"] = foodData["price"]
-		}
+		// if isNeedUpdatePrice {
+		skus[0]["price"] = foodData["price"]
+		// }
 		skus[0]["stock"] = stockCount2Mtwm(model.MaxStoreSkuStockQty)
 		if storeSku.Upc != "" {
 			skus[0]["upc"] = storeSku.Upc

From 1c76be0310a53ee0a9ef65eaed8a5edbf08c4293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 22 May 2020 18:05:57 +0800
Subject: [PATCH 229/285] =?UTF-8?q?=E5=89=8D=E7=BC=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 2eb432d8b..a2b2d51c6 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -29,12 +29,19 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 		for _, v := range storeSkuList {
 			//判断京东商城上是否有这个商品了，如果有就是添加规格而不是创建商品
 			name := filterSensitiveWord(v.Name)
-			result, err := api.JdShopAPI.SearchWare4Valid(name, 0, 0)
+			flag := false
+			result, err := api.JdShopAPI.SearchWare4Valid(name, 1, 100)
 			if err != nil {
 				failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 				return failedList, err
 			}
-			if result.TotalItem > 0 && len(result.Data) > 0 {
+			for _, v := range result.Data {
+				if v.Title == name {
+					flag = true
+					break
+				}
+			}
+			if result.TotalItem > 0 && len(result.Data) > 0 && flag {
 				for _, vv := range v.StoreSkuSyncInfoJds {
 					v.JdsWareID = result.Data[0].WareID
 					vv.JdsWareID = result.Data[0].WareID

From 045c892ce666518519ed68af76f8f6543221b3d7 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 08:31:20 +0800
Subject: [PATCH 230/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 55 +++++++++++++------------------
 1 file changed, 23 insertions(+), 32 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 045d7dc5c..d63da4ca5 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
-	"net/http"
 	"regexp"
 	"strings"
 	"time"
@@ -1500,36 +1498,29 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	// db := dao.GetDB()
-	// result1, _ := api.JdShopAPI.GetProvince()
-	// for _, v := range result1 {
-	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-	// 	place1.JdsCode = v.AreaID
-	// 	dao.UpdateEntity(db, place1, "JdsCode")
-	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-	// 	for _, vv := range result2 {
-	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-	// 		place2.JdsCode = vv.AreaID
-	// 		dao.UpdateEntity(db, place2, "JdsCode")
-	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-	// 		for _, vvv := range result3 {
-	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-	// 			place3.JdsCode = vvv.AreaID
-	// 			dao.UpdateEntity(db, place3, "JdsCode")
-	// 		}
-	// 	}
-	// }
-	request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
-	c := &http.Cookie{
-		Name:  "thor",
-		Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
+	db := dao.GetDB()
+	result1, _ := api.JdShopAPI.GetProvince()
+	for _, v := range result1 {
+		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+		place1.JdsCode = v.AreaID
+		dao.UpdateEntity(db, place1, "JdsCode")
+		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+		for _, vv := range result2 {
+			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+			place2.JdsCode = vv.AreaID
+			dao.UpdateEntity(db, place2, "JdsCode")
+			place22, _ := dao.GetPlaceByName(db, vv.AreaName, 3, 0)
+			if place22 != nil {
+				place22.JdsCode = vv.AreaID
+				dao.UpdateEntity(db, place22, "JdsCode")
+			}
+			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+			for _, vvv := range result3 {
+				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+				place3.JdsCode = vvv.AreaID
+				dao.UpdateEntity(db, place3, "JdsCode")
+			}
+		}
 	}
-	request.AddCookie(c)
-	client := &http.Client{}
-	fmt.Println(request)
-	response, _ := client.Do(request)
-	defer response.Body.Close()
-	bodyData, _ := ioutil.ReadAll(response.Body)
-	fmt.Println("test1", string(bodyData))
 	return err
 }

From 55cb35c1d091a5b86bd7ac86b2573a2650bc1ae6 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 09:32:23 +0800
Subject: [PATCH 231/285] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go         | 60 ++++++++++++++++-------
 business/partner/purchase/jdshop/store.go |  1 +
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d63da4ca5..4d518cefe 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -18,6 +18,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -1499,26 +1500,47 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	db := dao.GetDB()
-	result1, _ := api.JdShopAPI.GetProvince()
-	for _, v := range result1 {
-		place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
-		place1.JdsCode = v.AreaID
-		dao.UpdateEntity(db, place1, "JdsCode")
-		result2, _ := api.JdShopAPI.GetCity(v.AreaID)
-		for _, vv := range result2 {
-			place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
-			place2.JdsCode = vv.AreaID
-			dao.UpdateEntity(db, place2, "JdsCode")
-			place22, _ := dao.GetPlaceByName(db, vv.AreaName, 3, 0)
-			if place22 != nil {
-				place22.JdsCode = vv.AreaID
-				dao.UpdateEntity(db, place22, "JdsCode")
+	// result1, _ := api.JdShopAPI.GetProvince()
+	// for _, v := range result1 {
+	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
+	// 	place1.JdsCode = v.AreaID
+	// 	dao.UpdateEntity(db, place1, "JdsCode")
+	// 	result2, _ := api.JdShopAPI.GetCity(v.AreaID)
+	// 	for _, vv := range result2 {
+	// 		place2, _ := dao.GetPlaceByName(db, vv.AreaName, 2, 0)
+	// 		place2.JdsCode = vv.AreaID
+	// 		dao.UpdateEntity(db, place2, "JdsCode")
+	// 		place22, _ := dao.GetPlaceByName(db, vv.AreaName, 3, 0)
+	// 		if place22 != nil {
+	// 			place22.JdsCode = vv.AreaID
+	// 			dao.UpdateEntity(db, place22, "JdsCode")
+	// 		}
+	// 		result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
+	// 		for _, vvv := range result3 {
+	// 			place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
+	// 			place3.JdsCode = vvv.AreaID
+	// 			dao.UpdateEntity(db, place3, "JdsCode")
+	// 		}
+	// 	}
+	// }
+	beginTime := utils.Str2Time("2020-05-18")
+	endTime := utils.Str2Time("2020-05-24")
+	result, _ := misc.GetStoreTotalScoreList(nil, 0, "", beginTime, endTime, true, 50, 100, 1, 700)
+	for _, v := range result.StoreTotalScoreList {
+		storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+		if len(storeMaps) == 0 {
+			storeMap := &model.StoreMap{
+				Status:              1,
+				VendorID:            model.VendorIDJDShop,
+				AutoPickup:          1,
+				DeliveryCompetition: 1,
+				PricePercentage:     100,
+				IsSync:              1,
+				SyncRule:            1,
 			}
-			result3, _ := api.JdShopAPI.GetCounty(vv.AreaID)
-			for _, vvv := range result3 {
-				place3, _ := dao.GetPlaceByName(db, vvv.AreaName, 3, 0)
-				place3.JdsCode = vvv.AreaID
-				dao.UpdateEntity(db, place3, "JdsCode")
+			_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.StoreID, storeMap)
+			if err != nil {
+				continue
 			}
 		}
 	}
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index d90e0a4b6..11724cb66 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -104,6 +104,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		CategoryName: jdshopapi.JdsStoreCategoryName,
 		CustomerID:   utils.Int2Str(store.ID),
 	}
+	fmt.Println("test1", utils.Format4Output(createEntityStoreParam, false))
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }

From 10c5c21681e00af00c22bdb59ebeab922054a887 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 09:41:09 +0800
Subject: [PATCH 232/285] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 11724cb66..475fbf867 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -104,7 +104,7 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		CategoryName: jdshopapi.JdsStoreCategoryName,
 		CustomerID:   utils.Int2Str(store.ID),
 	}
-	fmt.Println("test1", utils.Format4Output(createEntityStoreParam, false))
+	// fmt.Println("test1", utils.Format4Output(createEntityStoreParam, false))
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }

From 8d8c5832396e88573a5c331daeda0e090a8ff01a Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 10:17:05 +0800
Subject: [PATCH 233/285] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 39 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 4d518cefe..de1d6492f 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1527,20 +1527,33 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	endTime := utils.Str2Time("2020-05-24")
 	result, _ := misc.GetStoreTotalScoreList(nil, 0, "", beginTime, endTime, true, 50, 100, 1, 700)
 	for _, v := range result.StoreTotalScoreList {
-		storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+		storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJX}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
 		if len(storeMaps) == 0 {
-			storeMap := &model.StoreMap{
-				Status:              1,
-				VendorID:            model.VendorIDJDShop,
-				AutoPickup:          1,
-				DeliveryCompetition: 1,
-				PricePercentage:     100,
-				IsSync:              1,
-				SyncRule:            1,
-			}
-			_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.StoreID, storeMap)
-			if err != nil {
-				continue
+			stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
+			store := stores[0]
+			if store.Status != model.StoreStatusDisabled && !strings.Contains(store.Name, "不做") {
+				pricePercentagePack := ""
+				if store.PayPercentage > 90 {
+					pricePercentagePack = "京西100"
+				} else if store.PayPercentage > 80 {
+					pricePercentagePack = "京西80"
+				} else {
+					pricePercentagePack = "京西70"
+				}
+				storeMap := &model.StoreMap{
+					Status:              1,
+					VendorID:            model.VendorIDJDShop,
+					AutoPickup:          1,
+					DeliveryCompetition: 1,
+					PricePercentage:     100,
+					IsSync:              1,
+					VendorStoreID:       utils.Int2Str(v.StoreID),
+					PricePercentagePack: pricePercentagePack,
+				}
+				_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.StoreID, storeMap)
+				if err != nil {
+					continue
+				}
 			}
 		}
 	}

From c07c859b8ac562f48e4f516c435a56c17f8901e8 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 10:56:06 +0800
Subject: [PATCH 234/285] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index de1d6492f..ca0367f77 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1533,9 +1533,9 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 			store := stores[0]
 			if store.Status != model.StoreStatusDisabled && !strings.Contains(store.Name, "不做") {
 				pricePercentagePack := ""
-				if store.PayPercentage > 90 {
+				if store.PayPercentage >= 90 {
 					pricePercentagePack = "京西100"
-				} else if store.PayPercentage > 80 {
+				} else if store.PayPercentage >= 80 {
 					pricePercentagePack = "京西80"
 				} else {
 					pricePercentagePack = "京西70"

From da104704ad8a86459c0b2e266a3866cf0eb3ceec Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sun, 24 May 2020 11:02:28 +0800
Subject: [PATCH 235/285] =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index ca0367f77..ea12386ea 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1542,7 +1542,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 				}
 				storeMap := &model.StoreMap{
 					Status:              1,
-					VendorID:            model.VendorIDJDShop,
+					VendorID:            model.VendorIDJX,
 					AutoPickup:          1,
 					DeliveryCompetition: 1,
 					PricePercentage:     100,
@@ -1550,7 +1550,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 					VendorStoreID:       utils.Int2Str(v.StoreID),
 					PricePercentagePack: pricePercentagePack,
 				}
-				_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.StoreID, storeMap)
+				_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJX, "", v.StoreID, storeMap)
 				if err != nil {
 					continue
 				}

From 6047bf15aa63d59bd39d498f086121dc53091cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 09:22:37 +0800
Subject: [PATCH 236/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E7=9B=B4=E8=BE=96=E5=B8=82=E8=A1=97=E9=81=93code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/store.go                   | 1 +
 business/partner/purchase/jdshop/store.go | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/model/store.go b/business/model/store.go
index 29180905d..7f0bd4c47 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -427,6 +427,7 @@ type StoreMap struct {
 	FakeOpenStart int16  `orm:"default(0)" json:"fakeOpenStart"` // 假开店开始
 	FakeOpenStop  int16  `orm:"default(0)" json:"fakeOpenStop"`  // 假开店结束
 	JdStoreLevel  string `orm:"size(32)" json:"jdStoreLevel"`    //京东门店等级
+	JdsStreetCode int    `orm:"default(0)" json:"jdsStreetCode"` //京东商城直辖市街道code
 
 	IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店
 
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 475fbf867..d90e0a4b6 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -104,7 +104,6 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		CategoryName: jdshopapi.JdsStoreCategoryName,
 		CustomerID:   utils.Int2Str(store.ID),
 	}
-	// fmt.Println("test1", utils.Format4Output(createEntityStoreParam, false))
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }

From 2f465df551ada418f4ec1d0e7c4c023c8cd5e7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 09:43:59 +0800
Subject: [PATCH 237/285] =?UTF-8?q?=E2=80=9C=E4=BA=AC=E4=B8=9C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E7=9B=B4=E8=BE=96=E5=B8=82=E9=97=A8=E5=BA=97=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 89 ++++++++++++++++++++-----------
 business/model/store.go           |  1 +
 2 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index ea12386ea..b050c6a2f 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -18,7 +18,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
-	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -1523,37 +1522,63 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		}
 	// 	}
 	// }
-	beginTime := utils.Str2Time("2020-05-18")
-	endTime := utils.Str2Time("2020-05-24")
-	result, _ := misc.GetStoreTotalScoreList(nil, 0, "", beginTime, endTime, true, 50, 100, 1, 700)
-	for _, v := range result.StoreTotalScoreList {
-		storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJX}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
-		if len(storeMaps) == 0 {
-			stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
-			store := stores[0]
-			if store.Status != model.StoreStatusDisabled && !strings.Contains(store.Name, "不做") {
-				pricePercentagePack := ""
-				if store.PayPercentage >= 90 {
-					pricePercentagePack = "京西100"
-				} else if store.PayPercentage >= 80 {
-					pricePercentagePack = "京西80"
-				} else {
-					pricePercentagePack = "京西70"
-				}
-				storeMap := &model.StoreMap{
-					Status:              1,
-					VendorID:            model.VendorIDJX,
-					AutoPickup:          1,
-					DeliveryCompetition: 1,
-					PricePercentage:     100,
-					IsSync:              1,
-					VendorStoreID:       utils.Int2Str(v.StoreID),
-					PricePercentagePack: pricePercentagePack,
-				}
-				_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJX, "", v.StoreID, storeMap)
-				if err != nil {
-					continue
-				}
+
+	///建店
+	// beginTime := utils.Str2Time("2020-05-18")
+	// endTime := utils.Str2Time("2020-05-24")
+	// result, _ := misc.GetStoreTotalScoreList(nil, 0, "", beginTime, endTime, true, 50, 100, 1, 700)
+	// for _, v := range result.StoreTotalScoreList {
+	// 	storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJX}, []int{v.StoreID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+	// 	if len(storeMaps) == 0 {
+	// 		stores, _ := dao.GetStoreList(db, []int{v.StoreID}, nil, nil, nil, "")
+	// 		store := stores[0]
+	// 		if store.Status != model.StoreStatusDisabled && !strings.Contains(store.Name, "不做") {
+	// 			pricePercentagePack := ""
+	// 			if store.PayPercentage >= 90 {
+	// 				pricePercentagePack = "京西100"
+	// 			} else if store.PayPercentage >= 80 {
+	// 				pricePercentagePack = "京西80"
+	// 			} else {
+	// 				pricePercentagePack = "京西70"
+	// 			}
+	// 			storeMap := &model.StoreMap{
+	// 				Status:              1,
+	// 				VendorID:            model.VendorIDJX,
+	// 				AutoPickup:          1,
+	// 				DeliveryCompetition: 1,
+	// 				PricePercentage:     100,
+	// 				IsSync:              1,
+	// 				VendorStoreID:       utils.Int2Str(v.StoreID),
+	// 				PricePercentagePack: pricePercentagePack,
+	// 			}
+	// 			_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJX, "", v.StoreID, storeMap)
+	// 			if err != nil {
+	// 				continue
+	// 			}
+	// 		}
+	// 	}
+	// }
+
+	//京东商城街道code
+	var stores []*model.Store
+	sql := `
+		SELECT b.*
+		  FROM store_map a, store b
+		 WHERE a.store_id = b.id 
+		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ? 
+		   AND b.deleted_at = ? 
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
+	err = dao.GetRows(db, &stores, sql, sqlParams)
+	for _, v := range stores {
+		result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat))
+		if result["regeocode"] != nil {
+			street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
+			if street != "" {
+				storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+				storeMap := storeMaps[0]
+				storeMap.JdsStreetName = street
+				dao.UpdateEntity(db, storeMap, "JdsStreetName")
 			}
 		}
 	}
diff --git a/business/model/store.go b/business/model/store.go
index 7f0bd4c47..647cc86d4 100644
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -428,6 +428,7 @@ type StoreMap struct {
 	FakeOpenStop  int16  `orm:"default(0)" json:"fakeOpenStop"`  // 假开店结束
 	JdStoreLevel  string `orm:"size(32)" json:"jdStoreLevel"`    //京东门店等级
 	JdsStreetCode int    `orm:"default(0)" json:"jdsStreetCode"` //京东商城直辖市街道code
+	JdsStreetName string `orm:"size(32)" json:"jdsStreetName"`   //京东商城直辖市街道
 
 	IsOrder int `orm:"default(0)" json:"isOrder"` //是否是下预订单门店
 

From 429c2529974ae43d466a6c03ca2656f7d1dbb268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:12:21 +0800
Subject: [PATCH 238/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=88=B0=E5=AE=B6?=
 =?UTF-8?q?=E5=BD=AD=E5=B7=9E=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/store.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index c46398f62..5b104c305 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -173,7 +173,13 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				}
 				if store.JdDistrictCode != 0 {
 					storeParams.County = store.JdDistrictCode
+					//彭州市做特殊处理
+					if store.JdDistrictCode == 49318 {
+						storeParams.City = 49318
+						storeParams.County = 310045
+					}
 				}
+
 				// storeParams.DeliveryRangeType = store.DeliveryRangeType
 				// if store.DeliveryRangeType == model.DeliveryRangeTypePolygon {
 				// 	storeParams.CoordinatePoints = store.DeliveryRange

From 350feaf265de1fae7e30f681131e785a18677bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:23:53 +0800
Subject: [PATCH 239/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go     | 46 +++++++++++++++++----------
 business/jxutils/smsmsg/smsmsg.go     | 16 ++++++++--
 business/partner/purchase/jd/store.go |  2 +-
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index b050c6a2f..d48aeeabb 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1559,28 +1559,42 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}
 	// }
 
-	//京东商城街道code
-	var stores []*model.Store
+	//京东商城街道name
+	// var stores []*model.Store
+	// sql := `
+	// 	SELECT b.*
+	// 	  FROM store_map a, store b
+	// 	 WHERE a.store_id = b.id
+	// 	   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
+	// 	   AND b.deleted_at = ?
+	// `
+	// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
+	// err = dao.GetRows(db, &stores, sql, sqlParams)
+	// for _, v := range stores {
+	// 	result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat))
+	// 	if result["regeocode"] != nil {
+	// 		street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
+	// 		if street != "" {
+	// 			storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
+	// 			storeMap := storeMaps[0]
+	// 			storeMap.JdsStreetName = street
+	// 			dao.UpdateEntity(db, storeMap, "JdsStreetName")
+	// 		}
+	// 	}
+	// }
+
+	var stores []*model.StoreMap
 	sql := `
-		SELECT b.*
+		SELECT a.*
 		  FROM store_map a, store b
-		 WHERE a.store_id = b.id 
-		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ? 
-		   AND b.deleted_at = ? 
+		 WHERE a.store_id = b.id
+		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
+		   AND b.deleted_at = ?
 	`
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	for _, v := range stores {
-		result, _ := api.AutonaviAPI.GetCoordinateAreaInfo(jxutils.IntCoordinate2Standard(v.Lng), jxutils.IntCoordinate2Standard(v.Lat))
-		if result["regeocode"] != nil {
-			street := result["regeocode"].(map[string]interface{})["addressComponent"].(map[string]interface{})["township"].(string)
-			if street != "" {
-				storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJDShop}, []int{v.ID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
-				storeMap := storeMaps[0]
-				storeMap.JdsStreetName = street
-				dao.UpdateEntity(db, storeMap, "JdsStreetName")
-			}
-		}
+		api.JdShopAPI.GetCity(parentID)
 	}
 	return err
 }
diff --git a/business/jxutils/smsmsg/smsmsg.go b/business/jxutils/smsmsg/smsmsg.go
index a59cbb478..56d014418 100644
--- a/business/jxutils/smsmsg/smsmsg.go
+++ b/business/jxutils/smsmsg/smsmsg.go
@@ -80,10 +80,20 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) {
 }
 
 func isPushSMS(order *model.GoodsOrder) bool {
-	stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
+	storeID := 0
+	if order.StoreID == 0 {
+		storeID = order.JxStoreID
+	} else {
+		storeID = order.StoreID
+	}
+	stores, _ := dao.GetStoresMapList(dao.GetDB(), []int{order.VendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "")
 	if len(stores) > 0 {
-		if stores[0].SMSNotifyMark == model.NO {
-			return true
+		if stores[0].IsOrder == model.NO {
+			if storeID == model.MatterStoreID {
+				return false
+			} else {
+				return true
+			}
 		} else {
 			return false
 		}
diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go
index 5b104c305..aca822b80 100644
--- a/business/partner/purchase/jd/store.go
+++ b/business/partner/purchase/jd/store.go
@@ -173,7 +173,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				}
 				if store.JdDistrictCode != 0 {
 					storeParams.County = store.JdDistrictCode
-					//彭州市做特殊处理
+					//TODO 彭州市做特殊处理 2020-05-25
 					if store.JdDistrictCode == 49318 {
 						storeParams.City = 49318
 						storeParams.County = 310045

From 5c487f4090388d1283adaf2497cbc006c8e5525c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:26:50 +0800
Subject: [PATCH 240/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d48aeeabb..d1ae5a332 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1583,18 +1583,18 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}
 	// }
 
-	var stores []*model.StoreMap
-	sql := `
-		SELECT a.*
-		  FROM store_map a, store b
-		 WHERE a.store_id = b.id
-		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
-		   AND b.deleted_at = ?
-	`
-	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
-	err = dao.GetRows(db, &stores, sql, sqlParams)
-	for _, v := range stores {
-		api.JdShopAPI.GetCity(parentID)
-	}
+	// var stores []*model.StoreMap
+	// sql := `
+	// 	SELECT a.*
+	// 	  FROM store_map a, store b
+	// 	 WHERE a.store_id = b.id
+	// 	   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
+	// 	   AND b.deleted_at = ?
+	// `
+	// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
+	// err = dao.GetRows(db, &stores, sql, sqlParams)
+	// for _, v := range stores {
+	// 	api.JdShopAPI.GetCity(parentID)
+	// }
 	return err
 }

From 509ade187118e40784d38e3ac25f9b1c24f9fc7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:27:04 +0800
Subject: [PATCH 241/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d1ae5a332..d9f9bc3d6 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1498,7 +1498,7 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	db := dao.GetDB()
+	// db := dao.GetDB()
 	// result1, _ := api.JdShopAPI.GetProvince()
 	// for _, v := range result1 {
 	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)

From 4b53553a107c33d5f3cba6681927fb602bea4221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:32:57 +0800
Subject: [PATCH 242/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 41 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index d9f9bc3d6..c140df40b 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1498,7 +1498,7 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	// db := dao.GetDB()
+	db := dao.GetDB()
 	// result1, _ := api.JdShopAPI.GetProvince()
 	// for _, v := range result1 {
 	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
@@ -1583,18 +1583,31 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}
 	// }
 
-	// var stores []*model.StoreMap
-	// sql := `
-	// 	SELECT a.*
-	// 	  FROM store_map a, store b
-	// 	 WHERE a.store_id = b.id
-	// 	   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
-	// 	   AND b.deleted_at = ?
-	// `
-	// sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
-	// err = dao.GetRows(db, &stores, sql, sqlParams)
-	// for _, v := range stores {
-	// 	api.JdShopAPI.GetCity(parentID)
-	// }
+	var stores []*model.StoreMap
+	sql := `
+		SELECT a.*
+		  FROM store_map a, store b
+		 WHERE a.store_id = b.id
+		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
+		   AND b.deleted_at = ?
+	`
+	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
+	err = dao.GetRows(db, &stores, sql, sqlParams)
+	result1, _ := api.JdShopAPI.GetProvince()
+	for _, v := range stores {
+		for _, vv := range result1 {
+			result2, _ := api.JdShopAPI.GetCity(vv.AreaID)
+			for _, vvv := range result2 {
+				result3, _ := api.JdShopAPI.GetCounty(vvv.AreaID)
+				for _, vvvv := range result3 {
+					if vvvv.AreaName == v.JdsStreetName {
+						v.JdsStreetCode = vvvv.AreaID
+						dao.UpdateEntity(db, v, "JdsStreetCode")
+					}
+					break
+				}
+			}
+		}
+	}
 	return err
 }

From fc988c12532cde7cfbbe1248434520633aaec997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:43:42 +0800
Subject: [PATCH 243/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store.go               | 11 +++++++----
 business/partner/purchase/jdshop/store.go |  3 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 0da14fad9..731167a18 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -35,10 +35,12 @@ type StoreDetail struct {
 	DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争
 	IsSync              int8 `orm:"default(1)" json:"isSync"`              // 是否同步
 
-	DistrictName string `json:"districtName"`
-	CityName     string `json:"cityName"`
-	ProvinceName string `json:"provinceName"` //省名
-	JdsCode      int    `json:"jdsCode"`      //京东商城地址代码
+	DistrictName  string `json:"districtName"`
+	CityName      string `json:"cityName"`
+	ProvinceName  string `json:"provinceName"`  //省名
+	JdsCode       int    `json:"jdsCode"`       //京东商城地址代码
+	JdsStreetCode int    `json:"jdsStreetCode"` //京东商城直辖市街道code
+	JdsStreetName string `json:"jdsStreetName"` //京东商城直辖市街道
 
 	IsAutoOrder   int8   `json:"isAutoOrder"`   // 平台是否自动接单，-1：否，0：未知，1：是
 	MarketManName string `json:"marketManName"` //市场负责人
@@ -96,6 +98,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	SELECT t1.*,
 	t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code,
 	t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix,
+	t2.jds_street_code, t2.jds_street_name,
 	t3.value price_percentage_pack_str,
 	t4.value freight_deduction_pack_str,
 	province.name province_name,
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index d90e0a4b6..e3439c52f 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -104,6 +104,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 		CategoryName: jdshopapi.JdsStoreCategoryName,
 		CustomerID:   utils.Int2Str(store.ID),
 	}
+	if store.JdsStreetCode != 0 {
+		createEntityStoreParam.AddCode = store.JdsStreetCode
+	}
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }

From f9136f14c54c9c67f3571a543f3b15f22e28b218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 10:56:36 +0800
Subject: [PATCH 244/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index c140df40b..08ac2b5cd 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1594,8 +1594,12 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	result1, _ := api.JdShopAPI.GetProvince()
+	var flag = false
 	for _, v := range stores {
 		for _, vv := range result1 {
+			if vv.AreaID != 1 && vv.AreaID != 2 && vv.AreaID != 3 && vv.AreaID != 4 {
+				continue
+			}
 			result2, _ := api.JdShopAPI.GetCity(vv.AreaID)
 			for _, vvv := range result2 {
 				result3, _ := api.JdShopAPI.GetCounty(vvv.AreaID)
@@ -1603,10 +1607,20 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 					if vvvv.AreaName == v.JdsStreetName {
 						v.JdsStreetCode = vvvv.AreaID
 						dao.UpdateEntity(db, v, "JdsStreetCode")
+						flag = true
+						break
 					}
+				}
+				if flag {
 					break
 				}
 			}
+			if flag {
+				break
+			}
+		}
+		if flag {
+			continue
 		}
 	}
 	return err

From 7c5ad56ae6a7855e4f51215934536f0907f94548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 11:00:04 +0800
Subject: [PATCH 245/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 08ac2b5cd..c6300fc43 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1594,7 +1594,6 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	result1, _ := api.JdShopAPI.GetProvince()
-	var flag = false
 	for _, v := range stores {
 		for _, vv := range result1 {
 			if vv.AreaID != 1 && vv.AreaID != 2 && vv.AreaID != 3 && vv.AreaID != 4 {
@@ -1607,20 +1606,11 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 					if vvvv.AreaName == v.JdsStreetName {
 						v.JdsStreetCode = vvvv.AreaID
 						dao.UpdateEntity(db, v, "JdsStreetCode")
-						flag = true
 						break
 					}
 				}
-				if flag {
-					break
-				}
+
 			}
-			if flag {
-				break
-			}
-		}
-		if flag {
-			continue
 		}
 	}
 	return err

From 88a29049b6a4810cb7295e12b61c6653d63b2bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 11:32:18 +0800
Subject: [PATCH 246/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index c6300fc43..469f1eb5a 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1590,13 +1590,14 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 		 WHERE a.store_id = b.id
 		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
 		   AND b.deleted_at = ?
+		   and a.jds_street_code = 0
 	`
 	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	result1, _ := api.JdShopAPI.GetProvince()
 	for _, v := range stores {
 		for _, vv := range result1 {
-			if vv.AreaID != 1 && vv.AreaID != 2 && vv.AreaID != 3 && vv.AreaID != 4 {
+			if vv.AreaID == 1 || vv.AreaID == 2 || vv.AreaID == 3 || vv.AreaID == 4 {
 				continue
 			}
 			result2, _ := api.JdShopAPI.GetCity(vv.AreaID)

From 8274b2e22c530318e92ef3f9cf4f96158d979b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 11:49:24 +0800
Subject: [PATCH 247/285] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/store.go               | 4 +++-
 business/partner/purchase/jdshop/store.go | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/model/dao/store.go b/business/model/dao/store.go
index 731167a18..cea3c67b6 100644
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -37,7 +37,8 @@ type StoreDetail struct {
 
 	DistrictName  string `json:"districtName"`
 	CityName      string `json:"cityName"`
-	ProvinceName  string `json:"provinceName"`  //省名
+	ProvinceName  string `json:"provinceName"` //省名
+	JdCode        int    `json:"jdCode"`
 	JdsCode       int    `json:"jdsCode"`       //京东商城地址代码
 	JdsStreetCode int    `json:"jdsStreetCode"` //京东商城直辖市街道code
 	JdsStreetName string `json:"jdsStreetName"` //京东商城直辖市街道
@@ -104,6 +105,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	province.name province_name,
 	district.name district_name,
 	district.jds_code jds_code,
+	district.jd_code jd_code,
 	city.name city_name,
 	IF(mm.name <> '', mm.name, mm.user_id2) market_man_name,
 	IF(om.name <> '', om.name, om.user_id2) operator_name,
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index e3439c52f..fb638620d 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -107,6 +107,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri
 	if store.JdsStreetCode != 0 {
 		createEntityStoreParam.AddCode = store.JdsStreetCode
 	}
+	if createEntityStoreParam.AddCode == 0 {
+		createEntityStoreParam.AddCode = store.JdCode
+	}
 	vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam)
 	return vendorStoreID, err
 }

From 4a5b0bbae2b194c0d26ca967f507716430c7d70c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 13:37:14 +0800
Subject: [PATCH 248/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=8E=E5=B8=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 469f1eb5a..b7063bbc8 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1583,9 +1583,9 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}
 	// }
 
-	var stores []*model.StoreMap
+	var stores []*model.Store
 	sql := `
-		SELECT a.*
+		SELECT b.*
 		  FROM store_map a, store b
 		 WHERE a.store_id = b.id
 		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
@@ -1596,17 +1596,15 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	result1, _ := api.JdShopAPI.GetProvince()
 	for _, v := range stores {
+		place, _ := dao.GetPlaceByCode(db, v.DistrictCode)
 		for _, vv := range result1 {
-			if vv.AreaID == 1 || vv.AreaID == 2 || vv.AreaID == 3 || vv.AreaID == 4 {
-				continue
-			}
 			result2, _ := api.JdShopAPI.GetCity(vv.AreaID)
 			for _, vvv := range result2 {
 				result3, _ := api.JdShopAPI.GetCounty(vvv.AreaID)
 				for _, vvvv := range result3 {
-					if vvvv.AreaName == v.JdsStreetName {
-						v.JdsStreetCode = vvvv.AreaID
-						dao.UpdateEntity(db, v, "JdsStreetCode")
+					if vvvv.AreaName == place.Name {
+						place.JdsCode = vvvv.AreaID
+						dao.UpdateEntity(db, place, "JdsCode")
 						break
 					}
 				}

From f3e1f4e83beaa628976ecf36cb0e07a352428d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 14:39:15 +0800
Subject: [PATCH 249/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97newearningprice2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jd/order.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 78328428e..07e500d79 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -6,6 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
@@ -71,7 +73,7 @@ func (c *PurchaseHandler) updateOrderFinancialInfo(a *jdapi.API, orderID string)
 	if err == nil {
 		if orderSettlement != nil {
 			updateOrderBySettleMent(order, orderSettlement)
-			err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney"})
+			err = partner.CurOrderManager.UpdateOrderFields(order, []string{ /*"WaybillTipMoney", */ "TotalShopMoney", "PmSubsidyMoney", "NewEarningPrice"})
 		}
 	}
 	return err
@@ -135,6 +137,10 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord
 		// order.WaybillTipMoney = orderSettlement.VenderPaidTips
 		order.TotalShopMoney = orderSettlement.SettlementAmount
 		order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney
+		stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
+		if len(stores) > 0 {
+			jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage)
+		}
 	}
 }
 

From 05ddde69e6fee2765e4b459d59c4c1ca42620c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 14:52:41 +0800
Subject: [PATCH 250/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go  | 108 +++++++++++++++++-----------------
 business/jxstore/misc/misc.go |   1 +
 2 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index ab5b9a2c1..aba24309c 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -1115,14 +1115,14 @@ func (v *VendorSync) SyncJdsStoresSkus(ctx *jxcontext.Context, storeIDs []int, i
 
 func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
-		mainSkusMap = make(map[int]*model.StoreSkuBind)
-		skusMap     = make(map[int]*model.StoreSkuBind)
-		updateList  []*model.StoreSkuBind
-		addList     []*model.StoreSkuBind
-		// skuBindInfos1    []*StoreSkuBindInfo
-		// skuBindInfos2    []*StoreSkuBindInfo
-		// resultInterface1 []interface{}
-		// resultInterface2 []interface{}
+		mainSkusMap      = make(map[int]*model.StoreSkuBind)
+		skusMap          = make(map[int]*model.StoreSkuBind)
+		updateList       []*model.StoreSkuBind
+		addList          []*model.StoreSkuBind
+		skuBindInfos1    []*StoreSkuBindInfo
+		skuBindInfos2    []*StoreSkuBindInfo
+		resultInterface1 []interface{}
+		resultInterface2 []interface{}
 	)
 	storeSkusMain, err := dao.GetStoresSkusInfo(db, []int{model.JdShopMainStoreID}, nil)
 	for _, v := range storeSkusMain {
@@ -1142,52 +1142,52 @@ func syncJdsStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch
 			}
 		}
 	}
-	fmt.Println("updateList", utils.Format4Output(updateList, false))
-	fmt.Println("addList", utils.Format4Output(addList, false))
-	// task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-	// 	func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-	// 		step := batchItemList[0].(int)
-	// 		switch step {
-	// 		case 0:
-	// 			if len(updateList) > 0 {
-	// 				task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-	// 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-	// 						storeBind := batchItemList[0].(*model.StoreSkuBind)
-	// 						retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
-	// 						return retVal, err
-	// 					}, updateList)
-	// 				tasksch.HandleTask(task, ptTask, false).Run()
-	// 				resultInterface1, err = task.GetResult(0)
-	// 				for _, v := range resultInterface1 {
-	// 					skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
-	// 				}
-	// 				hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
-	// 			}
-	// 		case 1:
-	// 			if len(addList) > 0 {
-	// 				task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-	// 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-	// 						storeBind := batchItemList[0].(*model.StoreSkuBind)
-	// 						retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
-	// 						return retVal, err
-	// 					}, addList)
-	// 				tasksch.HandleTask(task, ptTask, false).Run()
-	// 				resultInterface2, err = task.GetResult(0)
-	// 				for _, v := range resultInterface2 {
-	// 					skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
-	// 				}
-	// 				hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
-	// 			}
-	// 		}
-	// 		return retVal, err
-	// 	}, []int{0, 1})
-	// tasksch.HandleTask(task, nil, true).Run()
-	// if isAsync {
-	// 	hint = task.GetID()
-	// } else {
-	// 	_, err = task.GetResult(0)
-	// 	hint = "1"
-	// }
+	// fmt.Println("updateList", utils.Format4Output(updateList, false))
+	// fmt.Println("addList", utils.Format4Output(addList, false))
+	task := tasksch.NewParallelTask("正在同步京东商城的库存商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+		func(ptTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			step := batchItemList[0].(int)
+			switch step {
+			case 0:
+				if len(updateList) > 0 {
+					task := tasksch.NewParallelTask("同步门店库存", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+							storeBind := batchItemList[0].(*model.StoreSkuBind)
+							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, false)}
+							return retVal, err
+						}, updateList)
+					tasksch.HandleTask(task, ptTask, false).Run()
+					resultInterface1, err = task.GetResult(0)
+					for _, v := range resultInterface1 {
+						skuBindInfos1 = append(skuBindInfos1, v.(*StoreSkuBindInfo))
+					}
+					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos1, isAsync, isContinueWhenError, false)
+				}
+			case 1:
+				if len(addList) > 0 {
+					task := tasksch.NewParallelTask("同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+							storeBind := batchItemList[0].(*model.StoreSkuBind)
+							retVal = []*StoreSkuBindInfo{buildStoreSkuBindInfo(db, storeMap.StoreID, storeBind, true)}
+							return retVal, err
+						}, addList)
+					tasksch.HandleTask(task, ptTask, false).Run()
+					resultInterface2, err = task.GetResult(0)
+					for _, v := range resultInterface2 {
+						skuBindInfos2 = append(skuBindInfos2, v.(*StoreSkuBindInfo))
+					}
+					hint, err = UpdateStoresSkusByBind(ctx, ptTask, skuBindInfos2, isAsync, isContinueWhenError, false)
+				}
+			}
+			return retVal, err
+		}, []int{0, 1})
+	tasksch.HandleTask(task, nil, true).Run()
+	if isAsync {
+		hint = task.GetID()
+	} else {
+		_, err = task.GetResult(0)
+		hint = "1"
+	}
 	return hint, err
 }
 
diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 72e0f41d6..0da1f7350 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -402,6 +402,7 @@ func doDailyWork() {
 	//刷新京东商城订单结算价
 	orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, time.Now().AddDate(0, 0, -3).Format("20060102"), time.Now().Format("20060102"))
 	//同步京东商城门店库存和商品
+	cms.CurVendorSync.SyncJdsStoresSkus(jxcontext.AdminCtx, nil, true, true)
 	//同步上架京东商城待售商品
 	cms.RefreshJdsSkusStatus(jxcontext.AdminCtx)
 }

From 4a05098d2f274d4162620e71067e74b159974455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 14:54:14 +0800
Subject: [PATCH 251/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index a2b2d51c6..fc2a4863c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -190,7 +190,7 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 			if vendorStoreID == model.JdShopMainVendorStoreID {
 				err = api.JdShopAPI.UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
 			} else {
-				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{storeID}, []int{v.SkuID})
+				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
 				err = err2
 				if len(storeSkus) > 0 {
 					err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))

From f6ef25160b6aa15ab72a89ad3dc00225a51dcb7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 18:19:48 +0800
Subject: [PATCH 252/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scheduler/basesch/basesch_ext.go          |  2 +-
 business/jxstore/tempop/tempop.go             | 43 +++++++++----------
 controllers/jds_callback.go                   | 25 +++++++++++
 3 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 controllers/jds_callback.go

diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go
index 73531d641..556879844 100644
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -44,7 +44,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
 					stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
 					if len(stores) > 0 {
 						if stores[0].PayPercentage <= 50 {
-							order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 10000
+							order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - stores[0].PayPercentage/2)) / 100
 							dao.UpdateEntity(dao.GetDB(), order, "NewEarningPrice")
 						}
 					}
diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index b7063bbc8..0419576b5 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1585,31 +1585,28 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 
 	var stores []*model.Store
 	sql := `
-		SELECT b.*
-		  FROM store_map a, store b
-		 WHERE a.store_id = b.id
-		   AND a.vendor_store_id = '' AND a.vendor_id = 5 AND a.deleted_at = ?
-		   AND b.deleted_at = ?
-		   and a.jds_street_code = 0
+		SELECT a.*
+		FROM store a
+		LEFT JOIN store_map b ON a.id = b.store_id AND b.vendor_id = 5 AND b.deleted_at = '1970-01-01 00:00:00'
+		WHERE 1=1
+		AND (a.status = 1 OR a.status = 0)
+		AND b.id IS NULL
+		AND a.deleted_at = '1970-01-01 00:00:00'
 	`
-	sqlParams := []interface{}{utils.DefaultTimeValue, utils.DefaultTimeValue}
-	err = dao.GetRows(db, &stores, sql, sqlParams)
-	result1, _ := api.JdShopAPI.GetProvince()
+	err = dao.GetRows(db, &stores, sql, nil)
 	for _, v := range stores {
-		place, _ := dao.GetPlaceByCode(db, v.DistrictCode)
-		for _, vv := range result1 {
-			result2, _ := api.JdShopAPI.GetCity(vv.AreaID)
-			for _, vvv := range result2 {
-				result3, _ := api.JdShopAPI.GetCounty(vvv.AreaID)
-				for _, vvvv := range result3 {
-					if vvvv.AreaName == place.Name {
-						place.JdsCode = vvvv.AreaID
-						dao.UpdateEntity(db, place, "JdsCode")
-						break
-					}
-				}
-
-			}
+		storeMap := &model.StoreMap{
+			Status:              1,
+			VendorID:            model.VendorIDJDShop,
+			AutoPickup:          1,
+			DeliveryCompetition: 1,
+			PricePercentage:     100,
+			IsSync:              1,
+			SyncRule:            1,
+		}
+		_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.ID, storeMap)
+		if err != nil {
+			continue
 		}
 	}
 	return err
diff --git a/controllers/jds_callback.go b/controllers/jds_callback.go
new file mode 100644
index 000000000..28d407538
--- /dev/null
+++ b/controllers/jds_callback.go
@@ -0,0 +1,25 @@
+package controllers
+
+import (
+	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
+	"git.rosy.net.cn/jx-callback/globals/api"
+	"github.com/astaxie/beego"
+)
+
+type JdsController struct {
+	beego.Controller
+}
+
+func (c *JdsController) Msg(msgType string) {
+	c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
+	msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
+	if callbackResponse == nil {
+		callbackResponse = mtwm.OnCallbackMsg(msg)
+		if callbackResponse == nil {
+			callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
+		}
+	}
+	c.Data["json"] = callbackResponse
+	c.ServeJSON()
+}

From 2ba582c538d9b42a94b31d975a67ac0477f4ca0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 25 May 2020 18:20:50 +0800
Subject: [PATCH 253/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BB=BA=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/jds_callback.go | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/controllers/jds_callback.go b/controllers/jds_callback.go
index 28d407538..aee913bc3 100644
--- a/controllers/jds_callback.go
+++ b/controllers/jds_callback.go
@@ -1,9 +1,6 @@
 package controllers
 
 import (
-	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
-	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
-	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
 )
 
@@ -12,14 +9,14 @@ type JdsController struct {
 }
 
 func (c *JdsController) Msg(msgType string) {
-	c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
-	msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
-	if callbackResponse == nil {
-		callbackResponse = mtwm.OnCallbackMsg(msg)
-		if callbackResponse == nil {
-			callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
-		}
-	}
-	c.Data["json"] = callbackResponse
-	c.ServeJSON()
+	// c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
+	// msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
+	// if callbackResponse == nil {
+	// 	callbackResponse = mtwm.OnCallbackMsg(msg)
+	// 	if callbackResponse == nil {
+	// 		callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
+	// 	}
+	// }
+	// c.Data["json"] = callbackResponse
+	// c.ServeJSON()
 }

From b5860f161f97b090104911d87383465a21bf878d 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 May 2020 08:48:59 +0800
Subject: [PATCH 254/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9D=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 35 ++++++++++++++++++++
 controllers/jds_callback.go                  | 34 +++++++++++++------
 routers/router.go                            |  1 +
 3 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 business/partner/purchase/jdshop/callback.go

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
new file mode 100644
index 000000000..77c54ac2c
--- /dev/null
+++ b/business/partner/purchase/jdshop/callback.go
@@ -0,0 +1,35 @@
+package jdshop
+
+import (
+	"fmt"
+
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+)
+
+func OnCallbackMsg(msg *jdshopapi.CallBackResult) {
+	fmt.Println("testcallback")
+	// if CurPurchaseHandler != nil {
+	// 	if msg.Cmd == mtwmapi.MsgTypeStoreStatusChanged {
+	// 		response = CurPurchaseHandler.onStoreStatusChanged(msg)
+	// 	} else if msg.Cmd == mtwmapi.MsgTypePrivateNumberDowngrade {
+	// 		response = CurPurchaseHandler.onNumberDowngrade(msg)
+	// 	} else {
+	// 		if orderID := GetOrderIDFromMsg(msg); orderID != "" {
+	// 			jxutils.CallMsgHandler(func() {
+	// 				switch msg.Cmd {
+	// 				case mtwmapi.MsgTypeWaybillStatus:
+	// 					response = CurPurchaseHandler.onWaybillMsg(msg)
+	// 				default:
+	// 					response = CurPurchaseHandler.onOrderMsg(msg)
+	// 				}
+	// 			}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDMTWM))
+	// 		}
+	// 		/*if msg.Cmd == mtwmapi.MsgTypeOrderRefund || msg.Cmd == mtwmapi.MsgTypeOrderPartialRefund {
+	// 			utils.CallFuncAsync(func() {
+	// 				OnFinancialMsg(msg)
+	// 			})
+	// 		} */
+	// 	}
+	// }
+	// return response
+}
diff --git a/controllers/jds_callback.go b/controllers/jds_callback.go
index aee913bc3..35bfb65b3 100644
--- a/controllers/jds_callback.go
+++ b/controllers/jds_callback.go
@@ -1,6 +1,15 @@
 package controllers
 
 import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+
+	"git.rosy.net.cn/jx-callback/business/partner/purchase/jdshop"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
 )
 
@@ -8,15 +17,18 @@ type JdsController struct {
 	beego.Controller
 }
 
-func (c *JdsController) Msg(msgType string) {
-	// c.Data["json"] = mtwmapi.Err2CallbackResponse(nil, "")
-	// msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
-	// if callbackResponse == nil {
-	// 	callbackResponse = mtwm.OnCallbackMsg(msg)
-	// 	if callbackResponse == nil {
-	// 		callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
-	// 	}
-	// }
-	// c.Data["json"] = callbackResponse
-	// c.ServeJSON()
+func (c *JdsController) Msg() {
+	if c.Ctx.Input.Method() == http.MethodPost {
+		ctx := c.Ctx
+		ctx.Request.Body = ioutil.NopCloser(bytes.NewReader(ctx.Input.RequestBody))
+		call, err := api.JdShopAPI.GetCallbackMsg(ctx.Request)
+		if err == nil {
+			jdshop.OnCallbackMsg(call)
+		}
+		globals.SugarLogger.Debugf("jds callback callbackResponse:%s", utils.Format4Output(call, true))
+		c.Data["json"] = call
+		c.ServeJSON()
+	} else {
+		c.Abort("404")
+	}
 }
diff --git a/routers/router.go b/routers/router.go
index 5a12568a9..162e2ce63 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -157,6 +157,7 @@ func init() {
 	beego.AutoRouter(&controllers.Djsw2Controller{})
 	beego.AutoRouter(&controllers.TongLianController{})
 	beego.AutoRouter(&controllers.EclpController{})
+	beego.AutoRouter(&controllers.JdsController{})
 
 	// 如下都是用于检测存活的空接口
 	beego.Any("/", func(ctx *beecontext.Context) {

From 988e3ebacc8f630b97cdfc3b00991f7e5ba9e469 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 May 2020 10:35:45 +0800
Subject: [PATCH 255/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 61 +++++++++++++++++--
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fc2a4863c..d8a845c05 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -127,6 +127,21 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				}
 
 			}
+			var features = []*jdshopapi.CreateSkuParamFeatures{
+				&jdshopapi.CreateSkuParamFeatures{
+					Key:   "is7ToReturn", //不支持7天无理由退货
+					Value: "0",
+				},
+				&jdshopapi.CreateSkuParamFeatures{
+					Key:   "tssp", //支持分单？
+					Value: "4",
+				},
+				&jdshopapi.CreateSkuParamFeatures{
+					Key:   "isSds", //支持自提？
+					Value: "1",
+				},
+			}
+			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
 			for _, vv := range v.StoreSkuSyncInfoJds {
 				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
@@ -438,6 +453,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		attrIDs     = make(map[string]int) //贮存方式,净含量,保质期IDs
 		zctjValueID int64                  //贮存条件冷藏0-4的id
 		gcjkValueID int64                  //国产，进口的id
+		lbValueID   int64                  //类别的ID
 		attrsProp   []*jdshopapi.CreateSkuParamAttrs
 	)
 	attrs, err := api.JdShopAPI.FindAttrs(int(storeSku.VendorVendorCatID))
@@ -452,6 +468,8 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			attrIDs[v.Name] = v.ID
 		} else if v.Name == "国产/进口" {
 			attrIDs[v.Name] = v.ID
+		} else if v.Name == "类别" {
+			attrIDs[v.Name] = v.ID
 		}
 	}
 	values, _, err := api.JdShopAPI.FindValuesByAttrId(attrIDs["贮存条件"])
@@ -474,7 +492,6 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		}
 		attrsProp = append(attrsProp, attrgcjk)
 	}
-
 	attrZctj := &jdshopapi.CreateSkuParamAttrs{
 		AttrID:     utils.Int2Str(attrIDs["贮存条件"]),
 		AttrValues: []string{utils.Int64ToStr(zctjValueID)},
@@ -491,12 +508,20 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	attrsProp = append(attrsProp, attrJhl)
 	attrsProp = append(attrsProp, attrBzq)
 	createSkuParamWare.MultiCateProps = attrsProp
-	var features []*jdshopapi.CreateSkuParamFeatures
-	feature := &jdshopapi.CreateSkuParamFeatures{
-		Key:   "is7ToReturn", //不支持7天无理由退货
-		Value: "0",
+	var features = []*jdshopapi.CreateSkuParamFeatures{
+		&jdshopapi.CreateSkuParamFeatures{
+			Key:   "is7ToReturn", //不支持7天无理由退货
+			Value: "0",
+		},
+		&jdshopapi.CreateSkuParamFeatures{
+			Key:   "tssp", //支持分单？
+			Value: "4",
+		},
+		&jdshopapi.CreateSkuParamFeatures{
+			Key:   "isSds", //支持自提？
+			Value: "1",
+		},
 	}
-	features = append(features, feature)
 	createSkuParamWare.Features = features
 	//组合sku
 	var vendorPrice int64 = 0
@@ -504,6 +529,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 		var (
 			ggValueID    int64 //规格的属性id
 			attrsPropSku []*jdshopapi.CreateSkuParamAttrs
+			multiPropSku []*jdshopapi.CreateSkuParamAttrs
 		)
 		valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 		specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
@@ -529,6 +555,17 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			OuterID: utils.Int2Str(v.SkuID),
 		}
 		sku.SaleAttrs = attrsPropSku
+		if attrIDs["类别"] != 0 {
+			values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["类别"])
+			err = err2
+			lbValueID = values2[len(values2)-1].ID
+			attrlb := &jdshopapi.CreateSkuParamAttrs{
+				AttrID:     utils.Int2Str(attrIDs["类别"]),
+				AttrValues: []string{utils.Int64ToStr(lbValueID)},
+			}
+			multiPropSku = append(multiPropSku, attrlb)
+		}
+		sku.MultiCateProps = multiPropSku
 		createSkuParamSkus = append(createSkuParamSkus, sku)
 
 		if v.VendorPrice > vendorPrice {
@@ -601,6 +638,7 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 		ggValueID    int64 //规格的属性id
 		attrsPropSku []*jdshopapi.CreateSkuParamAttrs
 		skus         []*jdshopapi.UpdateSkusParamSkus
+		multiPropSku []*jdshopapi.CreateSkuParamAttrs
 	)
 	valuesSku, maxNo, _ := api.JdShopAPI.FindValuesByAttrId(attrIDs["规格"])
 	specQuality := utils.Float64ToStr(float64(v.SpecQuality)) + v.SpecUnit
@@ -638,6 +676,17 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 			api.JdShopAPI.DeleteSku(utils.Str2Int64(v.VendorSkuID))
 		}
 	}
+	if attrIDs["类别"] != 0 {
+		values2, _, err2 := api.JdShopAPI.FindValuesByAttrId(attrIDs["类别"])
+		err = err2
+		lbValueID := values2[len(values2)-1].ID
+		attrlb := &jdshopapi.CreateSkuParamAttrs{
+			AttrID:     utils.Int2Str(attrIDs["类别"]),
+			AttrValues: []string{utils.Int64ToStr(lbValueID)},
+		}
+		multiPropSku = append(multiPropSku, attrlb)
+	}
+	sku.MultiCateProps = multiPropSku
 	skus = append(skus, sku)
 	updateSkusParam.Skus = skus
 	return updateSkusParam, err

From 92014171dfaf45bf7912ed452f2a149853101e62 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 May 2020 14:06:10 +0800
Subject: [PATCH 256/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go                         |  1 +
 business/partner/purchase/jdshop/store_sku.go | 40 ++++++++++++++-----
 controllers/jds_callback.go                   |  2 +
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/business/model/sku.go b/business/model/sku.go
index 0a91336cb..3754220d3 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -18,6 +18,7 @@ const (
 	NoCatCatgoryID     = 291
 	NOSkuNameImg       = "https://image.jxc4.com/noGoodsImg.jpg"
 	SkuNameImgStandard = "?imageMogr2/thumbnail/!800x800r/gravity/Center/crop/800x800"
+	SkuNameImgToPng    = "?imageView2/0/format/png/q/75"
 )
 
 const (
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d8a845c05..20209018a 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -3,6 +3,7 @@ package jdshop
 import (
 	"regexp"
 	"strings"
+	"time"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -67,6 +68,25 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				if err != nil {
 					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 					return failedList, err
+				} else {
+					//追加商品透图
+					imageURL := ""
+					img := v.Img
+					if img != "" {
+						suffix := img[strings.LastIndex(img, "."):]
+						if suffix != ".png" {
+							if resBinary, _, err := jxutils.DownloadFileByURL(img + model.SkuNameImgToPng); err == nil {
+								downloadURL, err2 := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix()))
+								err = err2
+								imageURL, err = uploadImg(downloadURL, name, "tou")
+							}
+						}
+					}
+					err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
+					if err2 != nil {
+						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
+						return failedList, err
+					}
 				}
 				var paramAttrs = make(map[string]*jdshopapi.CreateSkuParamSkus)
 				var resultAttrs = make(map[string]int64)
@@ -133,13 +153,13 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					Value: "0",
 				},
 				&jdshopapi.CreateSkuParamFeatures{
-					Key:   "tssp", //支持分单？
+					Key:   "tssp", //支持自提
 					Value: "4",
 				},
-				&jdshopapi.CreateSkuParamFeatures{
-					Key:   "isSds", //支持自提？
-					Value: "1",
-				},
+				// &jdshopapi.CreateSkuParamFeatures{
+				// 	Key:   "isSds", //支持自提？
+				// 	Value: "1",
+				// },
 			}
 			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
@@ -514,13 +534,13 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Value: "0",
 		},
 		&jdshopapi.CreateSkuParamFeatures{
-			Key:   "tssp", //支持分单？
+			Key:   "tssp", //支持自提
 			Value: "4",
 		},
-		&jdshopapi.CreateSkuParamFeatures{
-			Key:   "isSds", //支持自提？
-			Value: "1",
-		},
+		// &jdshopapi.CreateSkuParamFeatures{
+		// 	Key:   "isSds", //支持分单
+		// 	Value: "1",
+		// },
 	}
 	createSkuParamWare.Features = features
 	//组合sku
diff --git a/controllers/jds_callback.go b/controllers/jds_callback.go
index 35bfb65b3..af05c996d 100644
--- a/controllers/jds_callback.go
+++ b/controllers/jds_callback.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 
@@ -18,6 +19,7 @@ type JdsController struct {
 }
 
 func (c *JdsController) Msg() {
+	fmt.Println("testjdscll")
 	if c.Ctx.Input.Method() == http.MethodPost {
 		ctx := c.Ctx
 		ctx.Request.Body = ioutil.NopCloser(bytes.NewReader(ctx.Input.RequestBody))

From 70d930630cca040ea2f9815d956171c6fef2aea2 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 May 2020 14:12:23 +0800
Subject: [PATCH 257/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 20209018a..4ddb52aa7 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -163,6 +163,26 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 			}
 			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
+			if err == nil {
+				//追加商品透图
+				imageURL := ""
+				img := v.Img
+				if img != "" {
+					suffix := img[strings.LastIndex(img, "."):]
+					if suffix != ".png" {
+						if resBinary, _, err := jxutils.DownloadFileByURL(img + model.SkuNameImgToPng); err == nil {
+							downloadURL, err2 := jxutils.UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix()))
+							err = err2
+							imageURL, err = uploadImg(downloadURL, name, "tou")
+						}
+					}
+				}
+				err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
+				if err2 != nil {
+					failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "更新商品基础信息")
+					return failedList, err
+				}
+			}
 			for _, vv := range v.StoreSkuSyncInfoJds {
 				updateSkusParam, err := buildUpdateSkusParam(v, vv, false)
 				if err != nil {
@@ -652,6 +672,8 @@ func buildUpdateSkusParam(storeSku *dao.StoreSkuSyncInfo, v *dao.StoreSkuSyncInf
 	for _, v := range attrs {
 		if v.Name == "规格" {
 			attrIDs[v.Name] = v.ID
+		} else if v.Name == "类别" {
+			attrIDs[v.Name] = v.ID
 		}
 	}
 	var (

From 00fa9d4d6131fae21165ccc6bb1dce611fcfbcc9 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 May 2020 14:21:31 +0800
Subject: [PATCH 258/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 4ddb52aa7..f644ae9b4 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -80,6 +80,8 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 								err = err2
 								imageURL, err = uploadImg(downloadURL, name, "tou")
 							}
+						} else {
+							imageURL, err = uploadImg(img, name, "tou")
 						}
 					}
 					err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
@@ -175,6 +177,8 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 							err = err2
 							imageURL, err = uploadImg(downloadURL, name, "tou")
 						}
+					} else {
+						imageURL, err = uploadImg(img, name, "tou")
 					}
 				}
 				err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)

From 2dba8fe5c73ba2465a3a137a334c63d4d4c8c79b 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 May 2020 15:31:35 +0800
Subject: [PATCH 259/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/misc/misc.go                 | 6 +++---
 business/partner/purchase/jdshop/store_sku.go | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go
index 0da1f7350..226797d12 100644
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -350,16 +350,16 @@ func syncStoreSku() {
 				errList.AddErr(err)
 			case 1:
 				//TODO 暂时不同步银豹（可能要从银豹到京西），2020-04-27
-				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, []int{1, 3, 5}))
+				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, []int{1, 3}))
 
 				// errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, partner.GetSingleStoreVendorIDs()))
-				_, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3, 5}, nil, false, true, cms.AmendPruneAll, false)
+				_, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, []int{1, 3}, nil, false, true, cms.AmendPruneAll, false)
 
 				// _, err = cms.CurVendorSync.AmendAndPruneStoreStuff(jxcontext.AdminCtx, partner.GetSingleStoreVendorIDs(), nil, false, true, cms.AmendPruneAll, false)
 				errList.AddErr(err)
 
 				SaveImportantTaskID(TaskNameSyncStoreSku, SpecialTaskID)
-				taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{1, 3, 5}, nil, false, nil, nil, syncFlag, true, true)
+				taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, []int{1, 3}, nil, false, nil, nil, syncFlag, true, true)
 				// taskID, err2 := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, db, partner.GetSingleStoreVendorIDs(), nil, false, nil, nil, syncFlag, true, true)
 
 				errList.AddErr(err2)
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index f644ae9b4..8d7ccfbcc 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -242,11 +243,12 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite {
 		var stock = 0
+		fmt.Println("testUpdateSkuSiteStock", storeID, vendorStoreID)
 		for _, v := range storeSkuList {
 			if status == model.SkuStatusNormal {
 				stock = 9999
 			}
-			if vendorStoreID == model.JdShopMainVendorStoreID {
+			if storeID == model.JdShopMainStoreID {
 				err = api.JdShopAPI.UpdateSkuStock(utils.Str2Int(v.VendorSkuID), stock)
 			} else {
 				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})

From e7e0b8c37a180c207c16fa0627fffc50b844f80c 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 May 2020 15:36:19 +0800
Subject: [PATCH 260/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 665b150b1..c25fec24f 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -393,6 +393,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		skus, err = dao.GetFullStoreSkus(db, vendorID, storeID)
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
+		fmt.Println("testGetStoreSkus", utils.Format4Output(skus, false))
 	}
 	if err != nil || len(skus) == 0 {
 		return err
@@ -605,6 +606,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			updateList = updateList[:]
 			updateList = rList2
 		}
+		fmt.Println("testonlineList", utils.Format4Output(onlineList, false))
+		fmt.Println("testofflineList", utils.Format4Output(offlineList, false))
 	}
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

From bb216f226f3fb746ef51b37aa732371583bbee42 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 May 2020 15:54:05 +0800
Subject: [PATCH 261/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index c25fec24f..69e34be88 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -393,7 +393,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		skus, err = dao.GetFullStoreSkus(db, vendorID, storeID)
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
-		fmt.Println("testGetStoreSkus", utils.Format4Output(skus, false))
 	}
 	if err != nil || len(skus) == 0 {
 		return err
@@ -522,6 +521,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 						if bareSku == nil {
 							bareSku = storeSkuSyncInfo2Bare(sku)
 						}
+						if vendorID == model.VendorIDJDShop && storeID == 102023 {
+							fmt.Println("test102023", utils.Format4Output(sku, false))
+						}
 						if sku.MergedStatus == model.SkuStatusNormal {
 							onlineList = append(onlineList, bareSku)
 							stockList = append(stockList, bareSku)
@@ -606,8 +608,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			updateList = updateList[:]
 			updateList = rList2
 		}
-		fmt.Println("testonlineList", utils.Format4Output(onlineList, false))
-		fmt.Println("testofflineList", utils.Format4Output(offlineList, false))
 	}
 	task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

From d555b0a50886d237643403521b3052e2a4b51f17 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 May 2020 15:59:31 +0800
Subject: [PATCH 262/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 69e34be88..820aae384 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -496,6 +496,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					parentTask.AddFailedList(failedList)
 				}
 			} else {
+				if vendorID == model.VendorIDJDShop && storeID == 102023 {
+					fmt.Println("test102023", utils.Format4Output(sku, false))
+				}
 				isAdded2Update := false
 				// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
 				if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
@@ -510,6 +513,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
 					priceList = append(priceList, bareSku)
 				}
+				if vendorID == model.VendorIDJDShop && storeID == 102023 {
+					fmt.Println("test102023", utils.Format4Output(sku, false))
+				}
 				if !isAdded2Update {
 					if model.IsSyncStatusUpdate(sku.SkuSyncStatus) && singleStoreHandler == nil { // 正常就不应该进到这里
 						if bareSku == nil {
@@ -517,6 +523,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 						}
 						updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagStockMask))
 					}
+					if vendorID == model.VendorIDJDShop && storeID == 102023 {
+						fmt.Println("test102023", utils.Format4Output(sku, false))
+					}
 					if model.IsSyncStatusSale(sku.SkuSyncStatus) {
 						if bareSku == nil {
 							bareSku = storeSkuSyncInfo2Bare(sku)

From 5077cdd41af386c422211925275c252f40e5d70d 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 May 2020 16:06:20 +0800
Subject: [PATCH 263/285] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 820aae384..c74a559e9 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -484,7 +484,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			}
 			isNeedReorder = true
 		} else {
-			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
+			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) && vendorID != model.VendorIDJDShop {
 				// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
 				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.StoreSkuStatus != model.SkuStatusDontSale) {
 					err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
@@ -496,9 +496,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					parentTask.AddFailedList(failedList)
 				}
 			} else {
-				if vendorID == model.VendorIDJDShop && storeID == 102023 {
-					fmt.Println("test102023", utils.Format4Output(sku, false))
-				}
 				isAdded2Update := false
 				// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
 				if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
@@ -513,9 +510,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
 					priceList = append(priceList, bareSku)
 				}
-				if vendorID == model.VendorIDJDShop && storeID == 102023 {
-					fmt.Println("test102023", utils.Format4Output(sku, false))
-				}
 				if !isAdded2Update {
 					if model.IsSyncStatusUpdate(sku.SkuSyncStatus) && singleStoreHandler == nil { // 正常就不应该进到这里
 						if bareSku == nil {
@@ -523,16 +517,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 						}
 						updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagStockMask))
 					}
-					if vendorID == model.VendorIDJDShop && storeID == 102023 {
-						fmt.Println("test102023", utils.Format4Output(sku, false))
-					}
 					if model.IsSyncStatusSale(sku.SkuSyncStatus) {
 						if bareSku == nil {
 							bareSku = storeSkuSyncInfo2Bare(sku)
 						}
-						if vendorID == model.VendorIDJDShop && storeID == 102023 {
-							fmt.Println("test102023", utils.Format4Output(sku, false))
-						}
 						if sku.MergedStatus == model.SkuStatusNormal {
 							onlineList = append(onlineList, bareSku)
 							stockList = append(stockList, bareSku)

From 19777d7443bb0a6cec60a2e9b10fa1568b1ba7b0 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 May 2020 18:11:54 +0800
Subject: [PATCH 264/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 8d7ccfbcc..5168c4f98 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,7 +1,6 @@
 package jdshop
 
 import (
-	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -243,7 +242,6 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo, status int) (failedList []*partner.StoreSkuInfoWithErr, err error) {
 	if globals.EnableJdShopWrite {
 		var stock = 0
-		fmt.Println("testUpdateSkuSiteStock", storeID, vendorStoreID)
 		for _, v := range storeSkuList {
 			if status == model.SkuStatusNormal {
 				stock = 9999
@@ -254,7 +252,9 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
 				storeSkus, err2 := dao.GetStoresSkusInfo(dao.GetDB(), []int{model.JdShopMainStoreID}, []int{v.SkuID})
 				err = err2
 				if len(storeSkus) > 0 {
-					err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
+					if storeSkus[0].JdsID != 0 {
+						err = api.JdShopAPI.UpdateSkuSiteStock(storeSkus[0].JdsID, stock, utils.Str2Int(vendorStoreID))
+					}
 				}
 			}
 		}

From 7e2bdec1fc06818dfa9e2a0300d56ac986f5a158 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 May 2020 18:30:45 +0800
Subject: [PATCH 265/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E6=8A=8A=E8=AE=A2=E5=8D=95=E5=B0=9D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 60 +++++++++++++++++--------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 0419576b5..9257cd023 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1498,7 +1500,7 @@ func addSku(outSkuId string, cagtegoryId int, shopCategories []int64, brandId in
 }
 
 func UploadJdsImage(ctx *jxcontext.Context) (err error) {
-	db := dao.GetDB()
+	// db := dao.GetDB()
 	// result1, _ := api.JdShopAPI.GetProvince()
 	// for _, v := range result1 {
 	// 	place1, _ := dao.GetPlaceByName(db, v.AreaName, 1, 0)
@@ -1583,31 +1585,35 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 	}
 	// }
 
-	var stores []*model.Store
-	sql := `
-		SELECT a.*
-		FROM store a
-		LEFT JOIN store_map b ON a.id = b.store_id AND b.vendor_id = 5 AND b.deleted_at = '1970-01-01 00:00:00'
-		WHERE 1=1
-		AND (a.status = 1 OR a.status = 0)
-		AND b.id IS NULL
-		AND a.deleted_at = '1970-01-01 00:00:00'
-	`
-	err = dao.GetRows(db, &stores, sql, nil)
-	for _, v := range stores {
-		storeMap := &model.StoreMap{
-			Status:              1,
-			VendorID:            model.VendorIDJDShop,
-			AutoPickup:          1,
-			DeliveryCompetition: 1,
-			PricePercentage:     100,
-			IsSync:              1,
-			SyncRule:            1,
-		}
-		_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.ID, storeMap)
-		if err != nil {
-			continue
-		}
-	}
+	// var stores []*model.Store
+	// sql := `
+	// 	SELECT a.*
+	// 	FROM store a
+	// 	LEFT JOIN store_map b ON a.id = b.store_id AND b.vendor_id = 5 AND b.deleted_at = '1970-01-01 00:00:00'
+	// 	WHERE 1=1
+	// 	AND (a.status = 1 OR a.status = 0)
+	// 	AND b.id IS NULL
+	// 	AND a.deleted_at = '1970-01-01 00:00:00'
+	// `
+	// err = dao.GetRows(db, &stores, sql, nil)
+	// for _, v := range stores {
+	// 	storeMap := &model.StoreMap{
+	// 		Status:              1,
+	// 		VendorID:            model.VendorIDJDShop,
+	// 		AutoPickup:          1,
+	// 		DeliveryCompetition: 1,
+	// 		PricePercentage:     100,
+	// 		IsSync:              1,
+	// 		SyncRule:            1,
+	// 	}
+	// 	_, err = cms.AddStoreVendorMap(ctx, db, model.VendorIDJDShop, "", v.ID, storeMap)
+	// 	if err != nil {
+	// 		continue
+	// 	}
+	// }
+	_, err = api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		Current:  1,
+		PageSize: 10,
+	})
 	return err
 }

From a708bd69ee4505409136a8a9cdaac4c10c8f48e0 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, 27 May 2020 08:35:21 +0800
Subject: [PATCH 266/285] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=90=A5=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index fb638620d..8980c54a5 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -61,23 +61,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		CustomerID:  utils.Int2Str(store.ID),
 	}
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
-	// if err == nil {
-	// 	if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
-	// 		// mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-	// 		request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24332466&storeStatus=1", nil)
-	// 		c := &http.Cookie{
-	// 			Name:  "thor",
-	// 			Value: "80FAF09E9A09B6E618A68057BDFCFCB8C86E8252DC9F7D3B34572625904FBA0AB6BF053A5325612EC0407791BB05F5301356E71E8B282C40C06D0B5DF3439DEECB102A78FAFF7AC0FC4E2D1FA8DD8BBAE1A011E50B5C74F1870AD982D7BF453F470F31F2241B73AC4C25485025C2ABEBC8A538AF7257824D2FAEE300A1435175B0B451FB5C19B78D729FC83152CA3BAF",
-	// 		}
-	// 		request.AddCookie(c)
-	// 		client := &http.Client{}
-	// 		fmt.Println("test1", request.URL)
-	// 		response, _ := client.Do(request)
-	// 		defer response.Body.Close()
-	// 		bodyData, _ := ioutil.ReadAll(response.Body)
-	// 		fmt.Println("test1", string(bodyData))
-	// 	}
-	// }
+	if err == nil {
+		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
+			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+			err = api.JdShopAPI.UpdateStoreStatus(storeID, mergeStatus)
+		}
+	}
 	return err
 }
 

From a9c2c3aa223670dacfa1dfb2be716b95faa6fd0b 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, 27 May 2020 08:54:48 +0800
Subject: [PATCH 267/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 8980c54a5..c96c9cf64 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -64,7 +64,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			err = api.JdShopAPI.UpdateStoreStatus(storeID, mergeStatus)
+			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
 		}
 	}
 	return err

From c28402063dddf61cffc1862d93c7cf4ed10bff70 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, 27 May 2020 09:14:16 +0800
Subject: [PATCH 268/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8Eaddcode=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index c96c9cf64..3e2046c3b 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -60,6 +60,12 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		ImageFile:   base64.StdEncoding.EncodeToString(data),
 		CustomerID:  utils.Int2Str(store.ID),
 	}
+	if store.JdsStreetCode != 0 {
+		updateEntityStoreParam.AddCode = store.JdsStreetCode
+	}
+	if updateEntityStoreParam.AddCode == 0 {
+		updateEntityStoreParam.AddCode = store.JdCode
+	}
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	if err == nil {
 		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {

From d1520597e84c4a675a4d02cb9e7c1e39419a97bd 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, 27 May 2020 09:24:37 +0800
Subject: [PATCH 269/285] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=86=E7=B1=BB=E5=88=B0=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/model/sku.go b/business/model/sku.go
index 3754220d3..25c31e894 100644
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -139,6 +139,7 @@ type SkuCategory struct {
 	IsExdSpec int    `json:"isExdSpec"` //是否是饿鲜达特有新建的分类
 	// JdID         int64  `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
 	// JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
+	IsSync int `json:"isSync"` //是否同步到平台
 }
 
 func (*SkuCategory) TableUnique() [][]string {

From cbbfddfd85b34771093f826430b650a2f8792049 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, 27 May 2020 09:30:04 +0800
Subject: [PATCH 270/285] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=B0=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/dao/sku.go       | 3 ++-
 business/model/dao/store_sku.go | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/business/model/dao/sku.go b/business/model/dao/sku.go
index a3a364889..be89fa4a9 100644
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -210,8 +210,9 @@ func GetSkuCategoryWithVendor(db *DaoDB, vendorIDs []int, appOrgCodes []string,
 	LEFT JOIN thing_map t1pm ON t1pm.thing_id = t1p.id AND t1pm.thing_type = ? AND t1m.deleted_at = ?
 		AND t1pm.vendor_id = t1m.vendor_id AND t1pm.vendor_org_code = t1m.vendor_org_code
 	WHERE 1 = 1
+	AND t1.is_sync <> ?
 	`
-	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue)
+	sqlParams = append(sqlParams, model.ThingTypeCategory, utils.DefaultTimeValue, model.YES)
 	if mustDirty {
 		sql += " AND t1m.sync_status IS NOT NULL AND t1m.sync_status <> 0"
 	} else {
diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go
index 3599c6ed9..0820bcc70 100644
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -362,8 +362,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level in
 	sql += `
 	LEFT JOIN sku_category t4p ON t4.parent_id = t4p.id
 	LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5.store_id = t5p.store_id AND t5p.deleted_at = ?
-	WHERE t5.store_id = ? AND t5.deleted_at = ?`
-	sqlParams = append(sqlParams, utils.DefaultTimeValue, storeID, utils.DefaultTimeValue)
+	WHERE t5.store_id = ? AND t5.deleted_at = ? AND t4.is_sync <> ?`
+	sqlParams = append(sqlParams, utils.DefaultTimeValue, storeID, utils.DefaultTimeValue, model.YES)
 	if mustDirty {
 		sql += " AND t5.%s_sync_status <> 0"
 		fieldPrefixParams = append(fieldPrefixParams, fieldPrefix)

From 9b5d84b2f370e8a7bb524be57014d86007fb2b8e 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, 27 May 2020 09:57:18 +0800
Subject: [PATCH 271/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 9257cd023..97aff3325 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
+	"net/http"
 	"regexp"
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
-
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1611,9 +1611,17 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		continue
 	// 	}
 	// }
-	_, err = api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
-		Current:  1,
-		PageSize: 10,
-	})
+	request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24339301&storeStatus=1", nil)
+	c := &http.Cookie{
+		Name:  "thor",
+		Value: "80FAF09E9A09B6E618A68057BDFCFCB88A0E4CE7743FBEC84F10D992F9C6A4119DF98DA3CAAE9C7F17BEB62884625B4E7BC82422A90F45F02EA293572D951B055EF0B5F603AEA568DFD4234138F841EC1AC1F67B30B48AAC9EAD5FBAE7943E1DCC99E99D8358C82F7832B71A2BCB31624E16BBF561720443DE966BDA3588406233A90224D9089710B102AA98B979B9B3",
+	}
+	request.AddCookie(c)
+	client := &http.Client{}
+	fmt.Println("test1", request.URL)
+	response, _ := client.Do(request)
+	defer response.Body.Close()
+	bodyData, _ := ioutil.ReadAll(response.Body)
+	fmt.Println("test1", string(bodyData))
 	return err
 }

From edad47e3ac6a8605388b1e7ff59c76f9bab03408 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, 27 May 2020 10:00:12 +0800
Subject: [PATCH 272/285] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index 97aff3325..dfc6aadfc 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -1619,6 +1619,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	request.AddCookie(c)
 	client := &http.Client{}
 	fmt.Println("test1", request.URL)
+	fmt.Println("test1", request.RemoteAddr)
 	response, _ := client.Do(request)
 	defer response.Body.Close()
 	bodyData, _ := ioutil.ReadAll(response.Body)

From cb187214831914d94adba2bf5a4af40e8c38f689 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, 27 May 2020 11:44:36 +0800
Subject: [PATCH 273/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/tempop/tempop.go             | 21 ++++++-------------
 business/partner/purchase/jd/order.go         | 12 ++++++++---
 business/partner/purchase/jdshop/store_sku.go |  8 +++----
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go
index dfc6aadfc..9257cd023 100644
--- a/business/jxstore/tempop/tempop.go
+++ b/business/jxstore/tempop/tempop.go
@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
-	"net/http"
 	"regexp"
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
+
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"github.com/360EntSecGroup-Skylar/excelize"
@@ -1611,18 +1611,9 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
 	// 		continue
 	// 	}
 	// }
-	request, _ := http.NewRequest(http.MethodGet, "https://stores.shop.jd.com/stores/updateStoreStatus?storeId=24339301&storeStatus=1", nil)
-	c := &http.Cookie{
-		Name:  "thor",
-		Value: "80FAF09E9A09B6E618A68057BDFCFCB88A0E4CE7743FBEC84F10D992F9C6A4119DF98DA3CAAE9C7F17BEB62884625B4E7BC82422A90F45F02EA293572D951B055EF0B5F603AEA568DFD4234138F841EC1AC1F67B30B48AAC9EAD5FBAE7943E1DCC99E99D8358C82F7832B71A2BCB31624E16BBF561720443DE966BDA3588406233A90224D9089710B102AA98B979B9B3",
-	}
-	request.AddCookie(c)
-	client := &http.Client{}
-	fmt.Println("test1", request.URL)
-	fmt.Println("test1", request.RemoteAddr)
-	response, _ := client.Do(request)
-	defer response.Body.Close()
-	bodyData, _ := ioutil.ReadAll(response.Body)
-	fmt.Println("test1", string(bodyData))
+	_, err = api.JdShopAPI.AllOrders(&jdshopapi.AllOrdersParam{
+		Current:  1,
+		PageSize: 10,
+	})
 	return err
 }
diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 07e500d79..055ca98d8 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -137,9 +137,15 @@ func updateOrderBySettleMent(order *model.GoodsOrder, orderSettlement *jdapi.Ord
 		// order.WaybillTipMoney = orderSettlement.VenderPaidTips
 		order.TotalShopMoney = orderSettlement.SettlementAmount
 		order.PmSubsidyMoney = orderSettlement.PlatOrderGoodsDiscountMoney + orderSettlement.PlatSkuGoodsDiscountMoney
-		stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
-		if len(stores) > 0 {
-			jxutils.RefreshOrderEarningPrice2(order, stores[0].PayPercentage)
+		if order.TotalShopMoney > 0 {
+			stores, _ := dao.GetStoreList(dao.GetDB(), []int{order.StoreID}, nil, nil, nil, "")
+			if len(stores) > 0 {
+				if stores[0].PayPercentage <= 50 {
+					order.NewEarningPrice = order.TotalShopMoney * int64((100 - stores[0].PayPercentage/2)) / 100
+				} else {
+					order.NewEarningPrice = order.EarningPrice
+				}
+			}
 		}
 	}
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 5168c4f98..34c541323 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -158,10 +158,10 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					Key:   "tssp", //支持自提
 					Value: "4",
 				},
-				// &jdshopapi.CreateSkuParamFeatures{
-				// 	Key:   "isSds", //支持自提？
-				// 	Value: "1",
-				// },
+				&jdshopapi.CreateSkuParamFeatures{
+					Key:   "fdms", //分单？
+					Value: "1",
+				},
 			}
 			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)

From d9af9c869dadd0996c844917007d272fd5cc942f 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, 27 May 2020 14:31:48 +0800
Subject: [PATCH 274/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 34c541323..b1659ba75 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -160,7 +160,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				},
 				&jdshopapi.CreateSkuParamFeatures{
 					Key:   "fdms", //分单？
-					Value: "1",
+					Value: "0",
 				},
 			}
 			updateWareParam.Features = features
@@ -563,10 +563,10 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Key:   "tssp", //支持自提
 			Value: "4",
 		},
-		// &jdshopapi.CreateSkuParamFeatures{
-		// 	Key:   "isSds", //支持分单
-		// 	Value: "1",
-		// },
+		&jdshopapi.CreateSkuParamFeatures{
+			Key:   "fdms", //分单？
+			Value: "1",
+		},
 	}
 	createSkuParamWare.Features = features
 	//组合sku

From dc04a990c12f7e7f8c8dba34b78730c8b9418a33 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, 27 May 2020 14:36:50 +0800
Subject: [PATCH 275/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index b1659ba75..d97348086 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -160,7 +160,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 				},
 				&jdshopapi.CreateSkuParamFeatures{
 					Key:   "fdms", //分单？
-					Value: "0",
+					Value: "1",
 				},
 			}
 			updateWareParam.Features = features

From 74bc4764f7fad3631b8df23a6d8cf6e2d0f6f3a7 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, 27 May 2020 14:40:54 +0800
Subject: [PATCH 276/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index d97348086..73d683ded 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -158,10 +158,10 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v
 					Key:   "tssp", //支持自提
 					Value: "4",
 				},
-				&jdshopapi.CreateSkuParamFeatures{
-					Key:   "fdms", //分单？
-					Value: "1",
-				},
+				// &jdshopapi.CreateSkuParamFeatures{
+				// 	Key:   "fdms", //分单？
+				// 	Value: "1",
+				// },
 			}
 			updateWareParam.Features = features
 			err = api.JdShopAPI.UpdateWare(updateWareParam)
@@ -563,10 +563,10 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 			Key:   "tssp", //支持自提
 			Value: "4",
 		},
-		&jdshopapi.CreateSkuParamFeatures{
-			Key:   "fdms", //分单？
-			Value: "1",
-		},
+		// &jdshopapi.CreateSkuParamFeatures{
+		// 	Key:   "fdms", //分单？
+		// 	Value: "1",
+		// },
 	}
 	createSkuParamWare.Features = features
 	//组合sku

From e58bc63c8258380e220313b7ba8d5876aad942dc 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, 27 May 2020 14:45:24 +0800
Subject: [PATCH 277/285] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=AC=E4=B8=9C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index c74a559e9..3f80b3122 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -432,7 +432,9 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	var failedList []*partner.StoreSkuInfoWithErr
 	for _, sku := range skus {
 		if vendorID == model.VendorIDJDShop && storeID != model.JdShopMainStoreID {
-			sku.SkuSyncStatus = model.SyncFlagSaleMask
+			if sku.SkuSyncStatus != 0 {
+				sku.SkuSyncStatus = model.SyncFlagSaleMask
+			}
 		}
 		if !useVendorPriceDirectly &&
 			!isSkuLockTimeValid(sku) {

From 7befc485610822f585da3adc68bf4bd03a5857e2 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, 27 May 2020 17:04:53 +0800
Subject: [PATCH 278/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=BA=97=E5=86=85=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go        |  2 +-
 business/partner/purchase/jdshop/store.go     |  8 +++----
 business/partner/purchase/jdshop/store_sku.go | 22 +++++++++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 3f80b3122..3c0d35393 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -335,7 +335,7 @@ func updateStoreSku(db *dao.DaoDB, vendorID int, storeSkuList []*dao.StoreSkuSyn
 		// 	}
 		// }()
 		if vendorID == model.VendorIDJDShop {
-			if syncStatus != model.SyncFlagPriceMask {
+			if syncStatus != model.SyncFlagPriceMask && syncStatus != model.SyncFlagSaleMask {
 				for _, v := range storeSkuList {
 					updateItemList := make([]*dao.KVUpdateItem, len(v.StoreSkuSyncInfoJds))
 					for k, vv := range v.StoreSkuSyncInfoJds {
diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go
index 3e2046c3b..0a308695b 100644
--- a/business/partner/purchase/jdshop/store.go
+++ b/business/partner/purchase/jdshop/store.go
@@ -68,10 +68,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	}
 	err = api.JdShopAPI.UpdateEntityStore(updateEntityStoreParam)
 	if err == nil {
-		if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
-			mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
-			err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
-		}
+		// if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
+		// 	mergeStatus := jxutils.MergeStoreStatus(store.Status, store.VendorStatus)
+		// 	err = api.JdShopAPI.UpdateStoreStatus(utils.Str2Int(store.VendorStoreID), jxStatus2JdsStatus(mergeStatus))
+		// }
 	}
 	return err
 }
diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 73d683ded..49ef7b245 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -1,6 +1,7 @@
 package jdshop
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -303,7 +304,10 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		err = updateOrCreateCategories(storeCat, true)
+		status, err := updateOrCreateCategories(storeCat, true)
+		if status == -1 {
+			return fmt.Errorf("京东商城店内分类创建失败！")
+		}
 		result, err := api.JdShopAPI.FindShopCategories()
 		if err != nil {
 			return err
@@ -320,7 +324,11 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
 
 func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		err = updateOrCreateCategories(storeCat, false)
+		status, err2 := updateOrCreateCategories(storeCat, false)
+		err = err2
+		if status == -1 {
+			return fmt.Errorf("京东商城店内分类更新失败！")
+		}
 	}
 	return err
 }
@@ -383,11 +391,11 @@ func vendorSku2Jx(result *jdshopapi.SearchWare4ValidResultData) (skuName *partne
 	return skuName
 }
 
-func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err error) {
+func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (status int64, err error) {
 	var createShopCategoryParams []*jdshopapi.CreateShopCategoryParam
 	result, err := api.JdShopAPI.FindShopCategories()
 	if err != nil {
-		return err
+		return -1, err
 	}
 	for _, v := range result {
 		createShopCategoryParam := &jdshopapi.CreateShopCategoryParam{
@@ -410,7 +418,7 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 	}
 	if isCreate {
 		createShopCategoryParam2.Type = jdshopapi.CreateCatType
-		createShopCategoryParam2.ID = "0"
+		createShopCategoryParam2.ID = "1"
 		createShopCategoryParams = append(createShopCategoryParams, createShopCategoryParam2)
 	} else {
 		for _, v := range createShopCategoryParams {
@@ -420,8 +428,8 @@ func updateOrCreateCategories(storeCat *dao.SkuStoreCatInfo, isCreate bool) (err
 			}
 		}
 	}
-	err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
-	return err
+	status, err = api.JdShopAPI.CreateShopCategory(createShopCategoryParams)
+	return status, err
 }
 
 func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *jdshopapi.CreateSkuParamWare, createSkuParamSkus []*jdshopapi.CreateSkuParamSkus, err error) {

From 69cbeac18e2f8184f51878048094755359403182 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, 27 May 2020 17:15:26 +0800
Subject: [PATCH 279/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=9B=E5=BB=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index 49ef7b245..fee44aeb1 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -85,7 +85,7 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 							imageURL, err = uploadImg(img, name, "tou")
 						}
 					}
-					err2 := api.JdShopAPI.TransparentImageAdd(v.JdsWareID, imageURL)
+					err2 := api.JdShopAPI.TransparentImageAdd(createSkuResult.WareID, imageURL)
 					if err2 != nil {
 						failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDJDShop], "创建商品")
 						return failedList, err

From 9e16281cfa905005aed74973ef96331880789176 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, 27 May 2020 17:21:37 +0800
Subject: [PATCH 280/285] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=88=86=E7=B1=BB=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/store_sku.go | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/business/partner/purchase/jdshop/store_sku.go b/business/partner/purchase/jdshop/store_sku.go
index fee44aeb1..8a6f64e8c 100644
--- a/business/partner/purchase/jdshop/store_sku.go
+++ b/business/partner/purchase/jdshop/store_sku.go
@@ -304,17 +304,26 @@ func (p *PurchaseHandler) GetStoreAllCategories(ctx *jxcontext.Context, storeID
 
 func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeCat *dao.SkuStoreCatInfo) (err error) {
 	if globals.EnableJdShopWrite && vendorStoreID == model.JdShopMainVendorStoreID {
-		status, err := updateOrCreateCategories(storeCat, true)
+		status, err2 := updateOrCreateCategories(storeCat, true)
+		err = err2
 		if status == -1 {
 			return fmt.Errorf("京东商城店内分类创建失败！")
 		}
-		result, err := api.JdShopAPI.FindShopCategories()
-		if err != nil {
-			return err
-		}
-		for _, v := range result {
-			if v.Name == storeCat.Name {
-				storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+		flag := false
+		for {
+			result, err := api.JdShopAPI.FindShopCategories()
+			if err != nil {
+				return err
+			}
+			for _, v := range result {
+				if v.Name == storeCat.Name {
+					storeCat.VendorCatID = utils.Int64ToStr(v.CID)
+					flag = true
+					break
+				}
+			}
+			time.Sleep(time.Second * 2)
+			if flag {
 				break
 			}
 		}

From 9b3e55a211cfa7c20a2bb935f8da418d4a16dcb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:12:13 +0800
Subject: [PATCH 281/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 14 ++++++++++++++
 controllers/jx_order.go                      | 14 ++++++++++++++
 routers/commentsRouter_controllers.go        |  9 +++++++++
 3 files changed, 37 insertions(+)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index e86b5649c..74c9c60f5 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1367,3 +1367,17 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
 	}
 	return err
 }
+
+func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPay *model.OrderPay, err error) {
+	sql := `
+		SELECT b.* 
+		  FROM goods_order a, order_pay b 
+		 WHERE a.vendor_order_id = b.vendor_order_id 
+		   AND a.vendor_id = b.vendor_id
+		   AND b.pay_finished_at <> ''
+		   AND a.vendor_order_id = ?
+	`
+	sqlParams := []interface{}{vendorOrderID}
+	err = dao.GetRow(dao.GetDB(), &orderPay, sql, sqlParams)
+	return orderPay, err
+}
diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 7cdef0c65..56f02fbde 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1045,3 +1045,17 @@ func (c *OrderController) GetOrderSimpleInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 根据订单号查询用户是否是第一次购买
+// @Description 根据订单号查询用户是否是第一次购买
+// @Param	token			header		string	false	"认证token"
+// @Param	vendorOrderID	query		string	true	"订单号"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetOrderUserBuyFirst [get]
+func (c *OrderController) GetOrderUserBuyFirst() {
+	c.callGetOrderUserBuyFirst(func(params *tOrderGetOrderUserBuyFirstParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = orderman.GetOrderUserBuyFirst(params.Ctx, params.VendorOrderID)
+		return retVal, "", err
+	})
+}
diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go
index cfbcedf1b..86c0ff4f1 100644
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -1044,6 +1044,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "GetOrderUserBuyFirst",
+            Router: `/GetOrderUserBuyFirst`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "GetOrderWaybillInfo",

From 13cd1e9f81e0a2d77f54bc95370908835faab1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:14:10 +0800
Subject: [PATCH 282/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/jx_order.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/jx_order.go b/controllers/jx_order.go
index 56f02fbde..271794378 100644
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1048,7 +1048,7 @@ func (c *OrderController) GetOrderSimpleInfo() {
 
 // @Title 根据订单号查询用户是否是第一次购买
 // @Description 根据订单号查询用户是否是第一次购买
-// @Param	token			header		string	false	"认证token"
+// @Param	token			header		string	true	"认证token"
 // @Param	vendorOrderID	query		string	true	"订单号"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult

From e0c01e3d7b05be3964cf0251c1f53db815b51611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:19:14 +0800
Subject: [PATCH 283/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 74c9c60f5..f4441fa92 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1374,7 +1374,7 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPa
 		  FROM goods_order a, order_pay b 
 		 WHERE a.vendor_order_id = b.vendor_order_id 
 		   AND a.vendor_id = b.vendor_id
-		   AND b.pay_finished_at <> ''
+		   AND b.pay_finished_at <> NULL
 		   AND a.vendor_order_id = ?
 	`
 	sqlParams := []interface{}{vendorOrderID}

From d8167c5facd5f431bc908cf45ddd406664ec44df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:31:32 +0800
Subject: [PATCH 284/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index f4441fa92..89e713132 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1371,13 +1371,17 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
 func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPay *model.OrderPay, err error) {
 	sql := `
 		SELECT b.* 
-		  FROM goods_order a, order_pay b 
-		 WHERE a.vendor_order_id = b.vendor_order_id 
-		   AND a.vendor_id = b.vendor_id
-		   AND b.pay_finished_at <> NULL
-		   AND a.vendor_order_id = ?
+		FROM goods_order a, order_pay b
+		WHERE a.vendor_order_id = b.vendor_order_id 
+		AND a.vendor_id = b.vendor_id
+		AND b.pay_finished_at <> 0
+		AND a.vendor_id = ?
+		AND a.user_id = (
+		SELECT user_id 
+		FROM goods_order WHERE vendor_order_id = ?)
+		AND a.vendor_order_id <> ?
 	`
-	sqlParams := []interface{}{vendorOrderID}
+	sqlParams := []interface{}{model.VendorIDJX, vendorOrderID, vendorOrderID}
 	err = dao.GetRow(dao.GetDB(), &orderPay, sql, sqlParams)
 	return orderPay, err
 }

From 303da7f0eff0857026f92ca99dc68041556c29c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 28 May 2020 09:35:55 +0800
Subject: [PATCH 285/285] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E7=AC=AC=E4=B8=80=E6=AC=A1=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/orderman_ext.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 89e713132..8eb0e4846 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1368,7 +1368,8 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
 	return err
 }
 
-func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPay *model.OrderPay, err error) {
+func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (isFirst bool, err error) {
+	var orderPays []*model.OrderPay
 	sql := `
 		SELECT b.* 
 		FROM goods_order a, order_pay b
@@ -1382,6 +1383,11 @@ func GetOrderUserBuyFirst(ctx *jxcontext.Context, vendorOrderID string) (orderPa
 		AND a.vendor_order_id <> ?
 	`
 	sqlParams := []interface{}{model.VendorIDJX, vendorOrderID, vendorOrderID}
-	err = dao.GetRow(dao.GetDB(), &orderPay, sql, sqlParams)
-	return orderPay, err
+	err = dao.GetRows(dao.GetDB(), &orderPays, sql, sqlParams)
+	if len(orderPays) > 0 {
+		return false, err
+	} else {
+		return true, err
+	}
+	return isFirst, err
 }