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

2022-11-17 17:59:29 +08:00
parent cd430f4d1e 338b61e2c8
commit e821d194a3
7 changed files with 175 additions and 24 deletions
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1522,7 +1522,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
 			return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID)
 		}
 		if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建
-			globals.SugarLogger.Debugf("vendorID ==============%d", vendorID)
 			if err2 := tiktok_store.CreateOrUpdateAll(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix)); err2 != nil {
 				errList.AddErr(err2)
 			}
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -249,7 +249,6 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
 							db2 = dao.GetDB()
 						}
 						if model.IsSyncStatusNew(storeMap.SyncStatus) {
-							globals.SugarLogger.Debugf("1.IsSyncStatusNew(storeMap.SyncStatus)")
 							storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, storeMap.VendorOrgCode)
 							if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName, nil, storeDetail); err == nil {
 								resultList = append(resultList, 1)
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -185,7 +185,6 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla
 			case 0:
 				if singleStoreHandler != nil {
 					_, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError)
-					globals.SugarLogger.Debugf("SyncStoreCategories in SyncStoreSkuNew2 err on: %s", err)
 				}
 			case 1:
 				err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError)
@@ -451,7 +450,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	} else {
 		skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
 	}
-
+	globals.SugarLogger.Debugf("skus :=            %d", len(skus))
 	if err != nil || len(skus) == 0 {
 		return err
 	}
@@ -474,7 +473,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 	singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
 	storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
 	reorderHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IStoreSkuSorter)
-
+	globals.SugarLogger.Debugf("=======singleStoreHandler %s", utils.Format4Output(singleStoreHandler, false))
 	var (
 		createList, updateList                                    []*dao.StoreSkuSyncInfo
 		deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo
@@ -493,12 +492,16 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			sku.VendorPrice = 0
 		}
 		sku.MergedStatus = MergeSkuSaleStatusWithStoreOpTime(sku, storeDetail, now)
+		globals.SugarLogger.Debugf("==============1 %d", sku.MergedStatus)
 		if vendorID == model.VendorIDMTWM && storeDetail.Status != model.StoreStatusOpened && storeDetail.AutoEnableAt != nil && storeDetail.AutoEnableAt.Sub(specailAutoEnableAt) == 0 && sku.MergedStatus == model.SkuStatusNormal {
 			sku.MergedStatus = model.SkuStatusDontSale
+			globals.SugarLogger.Debugf("==============2 %d", sku.MergedStatus)
 		}
 		if sku.Status != model.SkuStatusNormal {
 			sku.MergedStatus = model.SkuStatusDontSale
+			globals.SugarLogger.Debugf("==============3 %d", sku.MergedStatus)
 		}
+		globals.SugarLogger.Debugf("==============4 %d", sku.MergedStatus)
 		var bareSku *partner.StoreSkuInfo
 		isNeedReorder := false
 		if isStoreSkuSyncNeedDelete(sku) {
@@ -677,6 +680,15 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 		// }
 	}

+	globals.SugarLogger.Debugf("==============createList=%s", utils.Format4Output(createList, false))
+	globals.SugarLogger.Debugf("===============updateList%s", utils.Format4Output(updateList, false))
+	globals.SugarLogger.Debugf("==============deleteList=%s", utils.Format4Output(deleteList, false))
+	globals.SugarLogger.Debugf("===============priceList%s", utils.Format4Output(priceList, false))
+	globals.SugarLogger.Debugf("===============stockList%s", utils.Format4Output(stockList, false))
+	globals.SugarLogger.Debugf("==============onlineList=%s", utils.Format4Output(onlineList, false))
+	globals.SugarLogger.Debugf("===============offlineList %s", utils.Format4Output(offlineList, false))
+	globals.SugarLogger.Debugf("===============offlineList %s", 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) {
 			step := batchItemList[0].(int)
@@ -815,7 +827,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 				}
 			case 6:
 				if len(priceList) > 0 {
-					globals.SugarLogger.Debugf("更新门店商品价格=====")
 					_, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) {
 						if isNeedHandleAct(causeFlag) {
 							cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true)
--- a/business/model/api_config.go
+++ b/business/model/api_config.go
@@ -71,6 +71,7 @@ const (
 	MTWMStorePSWay13 = "0016"     //达达快递
 	MTWMStorePSWay14 = "0033"     //E_代送
 )
+const BrandIdChengShan = 142 // 成山农场品牌id

 type VendorInfo struct {
 	Name string `json:"name"`
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -688,6 +688,8 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"

+	globals.SugarLogger.Debugf("===========sql := %s", sql)
+	globals.SugarLogger.Debugf("===========sql := %s", utils.Format4Output(sqlParams, false))
 	if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
 		return nil, err
 	}
--- a/business/partner/purchase/tiktok_store/store_sku2.go
+++ b/business/partner/purchase/tiktok_store/store_sku2.go
@@ -205,7 +205,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
 			if v.VendorMainId == "" {
 				continue
 			}
-			globals.SugarLogger.Debugf("=========storeSkuList====:= %s", utils.Format4Output(v, false))
 			if err = getAPI(storeSkuList[0].VendorOrgCode, storeID, vendorStoreID).DeleteStoreCommodity(utils.Str2Int64(v.VendorMainId)); err != nil {
 				failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDDD], "删除主商品")...)
 			}