- 适配新平台API对于门店商品操作部分失败时返回详情的改动（没有实现处理）

business/jxstore/cms/sync_store_sku.go

@@ -328,7 +328,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
 			case 1:
 				if len(createList) > 0 {
 					_, err = putils.FreeBatchStoreSkuSyncInfo(func(batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) {
-						globals.SugarLogger.Debug(utils.Format4Output(batchedStoreSkuList, false))
 						if err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil {
 							_, err = updateStoreSku(dao.GetDB(), vendorID, batchedStoreSkuList, model.SyncFlagNewMask)
 						}

business/partner/purchase/ebai/order_test.go

@@ -18,7 +18,7 @@ func TestGetOrder4PartRefund(t *testing.T) {
 }
 
 func TestListOrders(t *testing.T) {
-	order, err := CurPurchaseHandler.ListOrders(jxcontext.AdminCtx, nil, utils.GetCurDate(), utils.DefaultTimeValue, "")
+	order, err := CurPurchaseHandler.ListOrders(jxcontext.AdminCtx, nil, utils.GetCurDate(), "")
 	if err != nil {
 		t.Fatal(err.Error())
 	} else {

business/partner/purchase/ebai/store_sku.go

@@ -241,7 +241,7 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 						if storeSku.NameID == 0 || storeSku.EbaiSyncStatus&model.SyncFlagDeletedMask != 0 {
 							if storeSku.EbaiSyncStatus&model.SyncFlagNewMask == 0 && !jxutils.IsEmptyID(storeSku.EbaiID) {
 								if globals.EnableEbaiStoreWrite {
-									if err = api.EbaiAPI.SkuDelete(strStoreID, utils.Int64ToStr(storeSku.EbaiID)); ebaiapi.IsErrSkuNotExist(err) {
+									if _, err = api.EbaiAPI.SkuDelete(strStoreID, []int64{storeSku.EbaiID}, nil); ebaiapi.IsErrSkuNotExist(err) {
 										err = nil
 									}
 								}

business/partner/purchase/ebai/store_sku2.go

@@ -1,9 +1,6 @@
 package ebai
 
 import (
-	"fmt"
-	"strings"
-
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -104,62 +101,67 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 
 func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
 	if globals.EnableEbaiStoreWrite {
-		err = api.EbaiAPI.SkuDelete(utils.Int2Str(storeID), strings.Join(partner.BareStoreSkuInfoList(storeSkuList).GetVendorSkuIDList(), ","))
+		_, err = api.EbaiAPI.SkuDelete(utils.Int2Str(storeID), partner.BareStoreSkuInfoList(storeSkuList).GetVendorSkuIDIntList(), nil)
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	var validSkus, invalidSkus []string
+	var validSkus, invalidSkus []int64
 	for _, storeSku := range storeSkuList {
 		if storeSku.Status == model.SkuStatusNormal {
-			validSkus = append(validSkus, storeSku.VendorSkuID)
+			validSkus = append(validSkus, utils.Str2Int64(storeSku.VendorSkuID))
 		} else {
-			invalidSkus = append(invalidSkus, storeSku.VendorSkuID)
+			invalidSkus = append(invalidSkus, utils.Str2Int64(storeSku.VendorSkuID))
 		}
 	}
 	if globals.EnableEbaiStoreWrite {
 		if len(invalidSkus) > 1 {
-			err = api.EbaiAPI.SkuOffline(utils.Int2Str(storeID), strings.Join(invalidSkus, ","))
+			_, err = api.EbaiAPI.SkuOffline(utils.Int2Str(storeID), invalidSkus, nil, nil)
 		} else if len(invalidSkus) == 1 {
-			err = api.EbaiAPI.SkuOfflineOne(utils.Int2Str(storeID), utils.Str2Int64(invalidSkus[0]), "", "")
+			err = api.EbaiAPI.SkuOfflineOne(utils.Int2Str(storeID), invalidSkus[0], "", "")
 		}
 		if err == nil {
 			if len(validSkus) > 1 {
-				err = api.EbaiAPI.SkuOnline(utils.Int2Str(storeID), strings.Join(validSkus, ","))
+				_, err = api.EbaiAPI.SkuOnline(utils.Int2Str(storeID), validSkus, nil, nil)
 			} else if len(validSkus) == 1 {
-				err = api.EbaiAPI.SkuOnlineOne(utils.Int2Str(storeID), utils.Str2Int64(validSkus[0]), "", "")
+				err = api.EbaiAPI.SkuOnlineOne(utils.Int2Str(storeID), validSkus[0], "", "")
 			}
 		}
 	}
 	return err
 }
 
-func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	skuPriceList := make([]string, len(storeSkuList))
+func StoreSkuInfoList2Ebai(storeSkuList []*partner.StoreSkuInfo) (outList ebaiapi.ShopSkuInfoList) {
+	outList = make(ebaiapi.ShopSkuInfoList, len(storeSkuList))
 	for k, v := range storeSkuList {
-		skuPriceList[k] = fmt.Sprintf("%s:%d", v.VendorSkuID, v.VendorPrice)
+		outList[k] = &ebaiapi.ShopSkuInfo{
+			SkuID: utils.Str2Int64WithDefault(v.VendorSkuID, 0),
+			// CustomSkuID: utils.Int2Str(v.SkuID),
+			SalePrice: v.VendorPrice,
+			Stock:     v.Stock,
+		}
 	}
+	return outList
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
 	if globals.EnableEbaiStoreWrite {
-		if len(skuPriceList) > 1 {
-			err = api.EbaiAPI.SkuPriceUpdateBatch(utils.Int2Str(storeID), strings.Join(skuPriceList, ";"), "", "")
-		} else if len(skuPriceList) == 1 {
-			err = api.EbaiAPI.SkuPriceUpdateOne(utils.Int2Str(storeID), skuPriceList[0], "", "")
+		if len(storeSkuList) > 1 {
+			_, err = api.EbaiAPI.SkuPriceUpdateBatch(utils.Int2Str(storeID), StoreSkuInfoList2Ebai(storeSkuList), ebaiapi.SkuIDTypeSkuID)
+		} else if len(storeSkuList) == 1 {
+			err = api.EbaiAPI.SkuPriceUpdateOne(utils.Int2Str(storeID), StoreSkuInfoList2Ebai(storeSkuList)[0])
 		}
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	skuStockList := make([]string, len(storeSkuList))
-	for k, v := range storeSkuList {
-		skuStockList[k] = fmt.Sprintf("%s:%d", v.VendorSkuID, v.Stock)
-	}
 	if globals.EnableEbaiStoreWrite {
-		if len(skuStockList) > 1 {
-			err = api.EbaiAPI.SkuStockUpdateBatch(utils.Int2Str(storeID), strings.Join(skuStockList, ";"), "", "")
-		} else if len(skuStockList) == 1 {
-			err = api.EbaiAPI.SkuStockUpdateOne(utils.Int2Str(storeID), skuStockList[0], "", "")
+		if len(storeSkuList) > 1 {
+			_, err = api.EbaiAPI.SkuStockUpdateBatch(utils.Int2Str(storeID), StoreSkuInfoList2Ebai(storeSkuList), ebaiapi.SkuIDTypeSkuID)
+		} else if len(storeSkuList) == 1 {
+			err = api.EbaiAPI.SkuStockUpdateOne(utils.Int2Str(storeID), StoreSkuInfoList2Ebai(storeSkuList)[0])
 		}
 	}
 	return err

business/partner/purchase/jd/store_sku2.go

@@ -41,7 +41,6 @@ func (p *PurchaseHandler) GetStoreSkusBareInfo(ctx *jxcontext.Context, parentTas
 					stockInfo, err = api.JdAPI.QueryOpenUseable(batchSkuInfoList)
 				} else {
 					priceInfo, err = api.JdAPI.GetStationInfoList(vendorStoreID, batchSkuList)
-					// globals.SugarLogger.Debug(utils.Format4Output(priceInfo, false))
 				}
 				return nil, err
 			}, []int{0, 1})

business/partner/purchase/mtwm/mtwm.go

@@ -153,10 +153,10 @@ func bizStatusJX2Mtwm(status int) (openLevel, online int) {
 }
 
 func skuStatusJX2Mtwm(status int) int {
-	if status == 1 {
-		return 0
+	if status == model.SkuStatusNormal {
+		return mtwmapi.SellStatusOnline
 	}
-	return 1
+	return mtwmapi.SellStatusOffline
 }
 
 func (p *PurchaseHandler) UploadImg(ctx *jxcontext.Context, imgURL string, imgData []byte, imgName string) (imgHint string, err error) {

business/partner/purchase/mtwm/store_sku.go

@@ -361,7 +361,16 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 						globals.SugarLogger.Debugf("mtwm SyncStoreSkus4 skuID:%d, SkuSyncStatus:%d", skuItem.SkuID, skuItem.StoreSkuSyncStatus)
 						sellStatus := skuStatusJX2Mtwm(jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus))
 						if globals.EnableMtwmStoreWrite {
-							if err2 := api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, foodDataList, sellStatus); err2 != nil {
+							if _, err2 := api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, []*mtwmapi.BareStoreFoodInfo{
+								&mtwmapi.BareStoreFoodInfo{
+									AppFoodCode: utils.Int2Str(skuItem.SkuID),
+									Skus: []*mtwmapi.BareStoreSkuInfo{
+										&mtwmapi.BareStoreSkuInfo{
+											SkuID: utils.Int2Str(skuItem.SkuID),
+										},
+									},
+								},
+							}, sellStatus); err2 != nil {
 								err = err2
 							}
 						}

business/partner/purchase/mtwm/store_sku2.go

@@ -13,6 +13,12 @@ import (
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
+const (
+	updateTypeStock = iota
+	updateTypeStatus
+	updateTypePrice
+)
+
 func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
 	switch funcID {
 	case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice:
@@ -145,7 +151,12 @@ func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, v
 		}
 	}
 	if globals.EnableMtwmStoreWrite {
-		err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList)
+		if len(foodDataList) == 1 {
+			foodDataList[0]["skus"] = string(utils.MustMarshal(foodDataList[0]["skus"]))
+			err = api.MtwmAPI.RetailInitData(vendorStoreID, utils.Int2Str(storeSkuList[0].SkuID), foodDataList[0])
+		} else if len(foodDataList) > 0 {
+			_, err = api.MtwmAPI.RetailBatchInitData(vendorStoreID, foodDataList)
+		}
 	}
 	if err == nil {
 		for _, storeSku := range storeSkuList {
@@ -169,8 +180,7 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
 	return err
 }
 
-func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	var validSkus, invalidSkus []*mtwmapi.BareStoreFoodInfo
+func storeSku2Mtwm(storeSkuList []*partner.StoreSkuInfo, updateType int) (validSkus, invalidSkus []*mtwmapi.BareStoreFoodInfo) {
 	for _, storeSku := range storeSkuList {
 		skuInfo := &mtwmapi.BareStoreFoodInfo{
 			AppFoodCode: storeSku.VendorSkuID,
@@ -180,65 +190,55 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID
 				},
 			},
 		}
-		if storeSku.Status == model.SkuStatusNormal {
+		if updateType == updateTypeStock {
+			if storeSku.Stock == model.MaxStoreSkuStockQty {
+				skuInfo.Skus[0].Stock = "*"
+			} else {
+				skuInfo.Skus[0].Stock = utils.Int2Str(storeSku.Stock)
+			}
+		} else if updateType == updateTypePrice {
+			skuInfo.Skus[0].Price = jxutils.IntPrice2StandardString(storeSku.VendorPrice)
+		}
+		if updateType != updateTypeStatus || storeSku.Status == model.SkuStatusNormal {
 			validSkus = append(validSkus, skuInfo)
 		} else {
 			invalidSkus = append(invalidSkus, skuInfo)
 		}
 	}
+	return validSkus, invalidSkus
+}
+
+func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
+	validSkus, invalidSkus := storeSku2Mtwm(storeSkuList, updateTypeStatus)
 	if globals.EnableMtwmStoreWrite {
 		if len(invalidSkus) > 0 {
-			err = api.MtwmAPI.RetailSkuSellStatus2(vendorStoreID, invalidSkus, 1)
+			_, err = api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, invalidSkus, mtwmapi.SellStatusOffline)
 		}
 		if err == nil && len(validSkus) > 0 {
-			err = api.MtwmAPI.RetailSkuSellStatus2(vendorStoreID, validSkus, 0)
+			_, err = api.MtwmAPI.RetailSkuSellStatus(vendorStoreID, validSkus, mtwmapi.SellStatusOnline)
 		}
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	var priceList []*mtwmapi.BareStoreFoodInfo
-	for _, storeSku := range storeSkuList {
-		skuInfo := &mtwmapi.BareStoreFoodInfo{
-			AppFoodCode: storeSku.VendorSkuID,
-			Skus: []*mtwmapi.BareStoreSkuInfo{
-				&mtwmapi.BareStoreSkuInfo{
-					SkuID: storeSku.VendorSkuID,
-					Price: jxutils.IntPrice2StandardString(storeSku.VendorPrice),
-				},
-			},
-		}
-		priceList = append(priceList, skuInfo)
-	}
+	priceList, _ := storeSku2Mtwm(storeSkuList, updateTypePrice)
 	if globals.EnableMtwmStoreWrite {
-		err = api.MtwmAPI.RetailSkuPrice(vendorStoreID, priceList)
+		_, err = api.MtwmAPI.RetailSkuPrice(vendorStoreID, priceList)
 	}
 	return err
 }
 
 func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (err error) {
-	var stockList []*mtwmapi.BareStoreFoodInfo
-	for _, storeSku := range storeSkuList {
-		skuInfo := &mtwmapi.BareStoreFoodInfo{
-			AppFoodCode: storeSku.VendorSkuID,
-			Skus: []*mtwmapi.BareStoreSkuInfo{
-				&mtwmapi.BareStoreSkuInfo{
-					SkuID: storeSku.VendorSkuID,
-					Stock: utils.Int2Str(storeSku.Stock),
-				},
-			},
-		}
-		stockList = append(stockList, skuInfo)
-	}
+	stockList, _ := storeSku2Mtwm(storeSkuList, updateTypeStock)
 	if globals.EnableMtwmStoreWrite {
-		err = api.MtwmAPI.RetailSkuStock(vendorStoreID, stockList)
+		_, err = api.MtwmAPI.RetailSkuStock(vendorStoreID, stockList)
 	}
 	return err
 }
 
 func mtwmSkuStatus2Jx(mtwmSkuStatus int) (jxSkuStatus int) {
-	if mtwmSkuStatus == 0 {
+	if mtwmSkuStatus == mtwmapi.SellStatusOnline {
 		jxSkuStatus = model.SkuStatusNormal
 	} else {
 		jxSkuStatus = model.SkuStatusDontSale