Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

business/jxstore/cms/store.go

@@ -6417,6 +6417,7 @@ func BatchUpdateMTStoreLogos(vendorOrgCode string, relInfo []MtRelInfo) (hint st
 }
 
 type TaoBindInfo struct {
+	storeID         int    `json:"storeID"`
 	VendorStoreID   string `json:"vendorStoreID"`
 	VendorStoreName string `json:"vendorStoreName"`
 	Status          string `json:"status"` //渠道营业状态
@@ -6430,7 +6431,6 @@ var TaoStoreStatus = map[string]int{
 // SingleBindTaoVegetable 单独绑定淘鲜达平台三方映射
 func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOrgCode string) (error, string) {
 	var (
-		storeID   = ""
 		db        *dao.DaoDB
 		errList   errlist.ErrList
 		errIDName = make([]string, 0)
@@ -6452,7 +6452,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr
 		//	}
 		//}
 		storeMap := &model.StoreMap{
-			StoreID:          utils.Str2Int(storeID),
+			StoreID:          v.storeID,
 			VendorID:         model.VendorIDTaoVegetable,
 			VendorOrgCode:    vendorOrgCode,
 			Status:           TaoStoreStatus[v.Status],
@@ -6466,7 +6466,7 @@ func SingleBindTaoVegetable(ctx *jxcontext.Context, bind []TaoBindInfo, vendorOr
 		//跟美团同步 平台调价、调价套餐
 		var (
 			cond = map[string]interface{}{
-				model.FieldStoreID:  storeID,
+				model.FieldStoreID:  v.storeID,
 				model.FieldVendorID: model.VendorIDMTWM,
 			}
 			tempMaps []*model.StoreMap