- new config param:EnableEbaiStoreWrite

business/partner/purchase/ebai/order.go

@@ -9,6 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -105,22 +106,28 @@ func (p *PurchaseHandler) GetOrder(vendorOrderID string) (order *model.GoodsOrde
 }
 
 func (p *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptIt bool, userName string) (err error) {
-	if isAcceptIt {
+	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
+		if isAcceptIt {
-	} else {
+			err = api.EbaiAPI.OrderConfirm(order.VendorOrderID)
-		err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu")
+		} else {
+			err = api.EbaiAPI.OrderCancel(order.VendorOrderID, ebaiapi.CancelTypeCustom, "bu")
+		}
 	}
 	return err
 }
 
 func (p *PurchaseHandler) PickupGoods(order *model.GoodsOrder, userName string) (err error) {
-	err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
+	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+		err = api.EbaiAPI.OrderCallDelivery(order.VendorOrderID)
+	}
 	return err
 }
 
 // 将订单从购物平台配送转为自送
 func (p *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
-	err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
+	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+		err = api.EbaiAPI.OrderSwitchselfdelivery(order.VendorOrderID)
+	}
 	return err
 }
 
@@ -132,13 +139,17 @@ func (p *PurchaseHandler) Swtich2SelfDelivered(order *model.GoodsOrder, userName
 
 // 完全自送的门店表示开始配送
 func (p *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userName string) (err error) {
-	err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
+	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+		err = api.EbaiAPI.OrderSendOut(order.VendorOrderID, userName)
+	}
 	return err
 }
 
 // 完全自送的门店表示配送完成
 func (p *PurchaseHandler) SelfDeliverDelievered(order *model.GoodsOrder, userName string) (err error) {
-	err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
+	if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
+		err = api.EbaiAPI.OrderComplete(order.VendorOrderID, userName)
+	}
 	return err
 }
 

business/partner/purchase/ebai/store.go

@@ -67,9 +67,13 @@ func (p *PurchaseHandler) CreateStore(db *dao.DaoDB, storeID int, userName strin
 		params["category1"] = ""
 		params["category2"] = ""
 		params["category3"] = ""
-		intVendorStoreID, err2 := api.EbaiAPI.ShopCreate(params)
+		if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
-		if err = err2; err == nil {
+			intVendorStoreID, err2 := api.EbaiAPI.ShopCreate(params)
-			return utils.Int64ToStr(intVendorStoreID), err
+			if err = err2; err == nil {
+				return utils.Int64ToStr(intVendorStoreID), err
+			}
+		} else {
+			return utils.Int64ToStr(jxutils.GenFakeID()), nil
 		}
 	}
 	return "", err
@@ -148,7 +152,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		for _, store := range stores {
 			params := genStoreMapFromStore(store)
 			// globals.SugarLogger.Debug(utils.Format4Output(params, false))
-			if globals.EnableStoreWrite {
+			if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 				if err = api.EbaiAPI.ShopUpdate(params); err == nil {
 					shopID := 0
 					if store.SyncStatus&model.SyncFlagDeletedMask == 0 {
@@ -218,7 +222,7 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask
 						shopIDs[k] = utils.GetUUID()
 					}
 				}
-				if globals.EnableStoreWrite {
+				if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 					err = api.EbaiAPI.ShopIDBatchUpdate(baiduShopIDs, shopIDs)
 				}
 				return nil, err

business/partner/purchase/ebai/store_sku.go

@@ -142,7 +142,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 				storeSku := batchItemList[0].(*tStoreSkuFullInfo)
 				updateFields := []string{model.FieldEbaiSyncStatus}
 				isCreate := false
-				if globals.EnableStoreWrite {
+				if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 					if storeSku.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 {
 						err = api.EbaiAPI.SkuDelete(strStoreID, utils.Int64ToStr(storeSku.EbaiID))
 					} else if storeSku.EbaiSyncStatus&model.SyncFlagNewMask != 0 {
@@ -237,7 +237,7 @@ func (p *PurchaseHandler) DeleteRemoteSkus(storeID int, vendorSkuIDs []string) (
 		for k, v := range batchItemList {
 			strList[k] = v.(string)
 		}
-		if globals.EnableStoreWrite {
+		if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 			err = api.EbaiAPI.SkuDelete(utils.Int2Str(storeID), strings.Join(strList, ","))
 		}
 		return nil, err
@@ -259,7 +259,7 @@ func (p *PurchaseHandler) DeleteRemoteCategories(storeID int, vendorCatIDs []int
 		}
 	}
 	task := tasksch.NewParallelTask("DeleteRemoteCategories", nil, "", func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-		if globals.EnableStoreWrite {
+		if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 			err = api.EbaiAPI.ShopCategoryDelete(strStoreID, batchItemList[0].(int64))
 		}
 		return nil, err
@@ -393,7 +393,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
 				updateFields := []string{model.FieldEbaiSyncStatus}
 				catInfo := batchItemList[0].(*tStoreCatInfo)
 				// globals.SugarLogger.Debug(utils.Format4Output(catInfo, false))
-				if globals.EnableStoreWrite {
+				if globals.EnableStoreWrite && globals.EnableEbaiStoreWrite {
 					if catInfo.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 { // 删除
 						err = api.EbaiAPI.ShopCategoryDelete(strStoreID, catInfo.EbaiID)
 					} else if catInfo.EbaiSyncStatus&model.SyncFlagNewMask != 0 { // 新增

conf/app.conf

@@ -16,6 +16,7 @@ autonaviKey = "4427170f870af2110becb8852d36ab08"
 
 enableStore = true
 enableStoreWrite = false
+enableEbaiStoreWrite = false
 orderUseNewTable = true
 
 aliKey = "LTAI6xJUGaP6WdMQ"

globals/globals.go

@@ -23,9 +23,10 @@ var (
 	AliKey    string
 	AliSecret string
 
-	EnableStore      bool
+	EnableStore          bool
-	EnableStoreWrite bool
+	EnableStoreWrite     bool
-	OrderUseNewTable bool
+	EnableEbaiStoreWrite bool
+	OrderUseNewTable     bool
 
 	QiniuBucket string
 )
@@ -52,6 +53,8 @@ func Init() {
 
 	EnableStore = beego.AppConfig.DefaultBool("enableStore", false)
 	EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false)
+	EnableEbaiStoreWrite = beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false)
+
 	if EnableStore {
 		OrderUseNewTable = beego.AppConfig.DefaultBool("orderUseNewTable", false)
 	}