From d00efac32553a01ef6d0565a555a3cf887e0d3c5 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, 30 Oct 2019 10:41:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=AE=E5=BC=82=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jd/store_sku2.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/business/partner/purchase/jd/store_sku2.go b/business/partner/purchase/jd/store_sku2.go index 81387c924..fc3d5f7d2 100644 --- a/business/partner/purchase/jd/store_sku2.go +++ b/business/partner/purchase/jd/store_sku2.go @@ -1,8 +1,6 @@ package jd import ( - "fmt" - "git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" @@ -40,9 +38,7 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { subTaskID := batchItemList[0].(int) if subTaskID == 0 { - fmt.Println("test1:111111111") stockInfo, err = getAPI("").QueryOpenUseable(batchSkuInfoList) - fmt.Println(stockInfo) } else { priceInfo, err = getAPI("").GetStationInfoList(vendorStoreID, batchSkuList) } From 9a67c628922ef551afcd75d5434a4801751d79ec Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 14 Nov 2019 16:14:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=95=86=E5=AE=B6=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=87=8D=E6=8E=92=E5=BA=8F=E5=90=8E=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E5=A4=84=E7=90=86=E5=8D=95=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=9A=84=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/sku.go | 2 ++ business/model/const.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index c809fa291..bfa4091ed 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -213,8 +213,10 @@ func ReorderCategories(ctx *jxcontext.Context, parentID int, categoryIDs []int, break } } + SetStoreCategorySyncStatus2(db, nil, categoryIDs, model.SyncFlagModifiedMask) if err == nil { _, err = CurVendorSync.SyncReorderCategories(ctx, db, parentID, false, userName) + CurVendorSync.SyncStoresCategory(ctx, db, nil, nil, false, true, true) } } } diff --git a/business/model/const.go b/business/model/const.go index 1a6030675..7dc9d85f8 100644 --- a/business/model/const.go +++ b/business/model/const.go @@ -173,7 +173,7 @@ const ( OrderStatusUnknown = 0 - OrderStatusNew = 5 // 新订单 + OrderStatusNew = 5 // 新订单，实际是已经支付 OrderStatusAccepted = 10 // 已经接单，也即待出库，待拣货 OrderStatusFinishedPickup = 15 // 拣货完成 From 1de4525ff68c3c2870dbda784584ab281d298f05 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 14 Nov 2019 16:24:49 +0800 Subject: [PATCH 3/3] up --- business/jxstore/cms/sync.go | 2 +- business/jxstore/cms/sync_store_sku.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index 750931e3e..df1f11578 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -403,7 +403,7 @@ func (v *VendorSync) SyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendo } func (v *VendorSync) proxySyncStoreCategory(ctx *jxcontext.Context, parentTask tasksch.ITask, storeMap *model.StoreMap, nameIDs, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - return SyncStorCategories(ctx, parentTask, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, nil, skuIDs, isAsync, isContinueWhenError) + return SyncStoreCategories(ctx, parentTask, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, nil, skuIDs, isAsync, isContinueWhenError) } func (v *VendorSync) proxySyncStoreSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeMap *model.StoreMap, nameIDs, skuIDs, excludeSkuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index d63cf40d9..af131ac6b 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -61,8 +61,8 @@ func CreateStoreCategoryByStoreSku(ctx *jxcontext.Context, vendorID, storeID int return err } -func SyncStorCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { - globals.SugarLogger.Debugf("SyncStorCategories %s storeID:%d, %s, userName:%s", model.VendorChineseNames[vendorID], storeID, vendorStoreID, ctx.GetUserName()) +func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) { + globals.SugarLogger.Debugf("SyncStoreCategories %s storeID:%d, %s, userName:%s", model.VendorChineseNames[vendorID], storeID, vendorStoreID, ctx.GetUserName()) handler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) num := 0 db := dao.GetDB() @@ -143,7 +143,7 @@ func SyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID, switch step { case 0: if singleStoreHandler != nil { - _, err = SyncStorCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) + _, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError) } case 1: err = syncStoreSkuNew(ctx, task, false, vendorID, storeID, nameIDs, skuIDs, excludeSkuIDs, isContinueWhenError)