liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-11 18:39:53 +08:00
parent e7a46e7e0d
commit 9139505718
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/store.go
View File

@@ -1522,7 +1522,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID) return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID)
} }
if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建 if vendorID == model.VendorIDDD { //抖店绑定店铺时 检查并补充创建
globals.SugarLogger.Debugf("vendorID ==============%d", vendorID)
if err2 := tiktok_store.CreateAndBindAllV2(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix), userName); err2 != nil { if err2 := tiktok_store.CreateAndBindAllV2(vendorOrgCode, int64(storeMap.StoreID), utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix), userName); err2 != nil {
errList.AddErr(err2) errList.AddErr(err2)
} }
@@ -1595,8 +1594,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName) _, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)
_, err = CurVendorSync.FullSyncStoresSkus(ctx, db, []int{vendorID}, []int{storeID}, true, nil, true, true) _, err = CurVendorSync.FullSyncStoresSkus(ctx, db, []int{vendorID}, []int{storeID}, true, nil, true, true)
if utils.IsNil(errList) && err == nil { if utils.IsNil(errList) && err == nil {
globals.SugarLogger.Debug("utils.IsNil(errList)==============", utils.IsNil(errList))
globals.SugarLogger.Debug("fakeErr===========%v,%v", errList, err)
return outStoreMap, nil return outStoreMap, nil
} else { } else {
return outStoreMap, errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, true), err)) return outStoreMap, errors.New(fmt.Sprintf("errList=%s,err=%v", utils.Format4Output(errList, true), err))
@@ -1786,7 +1783,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
} }
dao.Commit(db, txDB) dao.Commit(db, txDB)
if isStoreMapNeedSync(vendorID, valid) { if isStoreMapNeedSync(vendorID, valid) {
globals.SugarLogger.Debug("1.isStoreMapNeedSync(vendorID, valid)=================", isStoreMapNeedSync(vendorID, valid))
_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName) _, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
globals.SugarLogger.Debug("CurVendorSync.SyncStore:err======%v", err) globals.SugarLogger.Debug("CurVendorSync.SyncStore:err======%v", err)
} }
@@ -1794,7 +1790,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
} }
errList.AddErr(err) errList.AddErr(err)
endErr := errList.GetErrListAsOne() endErr := errList.GetErrListAsOne()
globals.SugarLogger.Info("endErr==============", endErr)
return num, endErr return num, endErr
} }

15
business/jxstore/cms/sync_store_sku.go
View File

@@ -129,7 +129,6 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
// } // }
} }
} else if model.IsSyncStatusUpdate(catInfo.CatSyncStatus) { // 修改 1 } else if model.IsSyncStatusUpdate(catInfo.CatSyncStatus) { // 修改 1
globals.SugarLogger.Debugf("============7:修改")
err = handler.UpdateStoreCategory(ctx, storeID, vendorStoreID, catInfo) err = handler.UpdateStoreCategory(ctx, storeID, vendorStoreID, catInfo)
if err == nil { if err == nil {
updateFields = append(updateFields, idFieldName) updateFields = append(updateFields, idFieldName)
@@ -515,14 +514,11 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask)) updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask))
} }
} else if model.IsSyncStatusNew(sku.SkuSyncStatus) { } else if model.IsSyncStatusNew(sku.SkuSyncStatus) {
globals.SugarLogger.Debugf("==========IsSyncStatusNew := %d", 333)
calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)) calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))
if singleStoreHandler == nil { if singleStoreHandler == nil {
if dao.IsVendorThingIDEmpty(sku.VendorSkuID) { if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
globals.SugarLogger.Debugf("==========IsSyncStatusNew := %d", 3333)
// todo 多平台商品库没有正常创建，直接跳过 // todo 多平台商品库没有正常创建，直接跳过
} else { } else {
globals.SugarLogger.Debugf("==========IsSyncStatusNew := %d", 33333)
sku.SkuSyncStatus |= model.SyncFlagSaleMask | model.SyncFlagPriceMask sku.SkuSyncStatus |= model.SyncFlagSaleMask | model.SyncFlagPriceMask
bareSku = storeSkuSyncInfo2Bare(sku) bareSku = storeSkuSyncInfo2Bare(sku)
stockList = append(stockList, bareSku) stockList = append(stockList, bareSku)
@@ -560,7 +556,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
parentTask.AddFailedList(failedList) parentTask.AddFailedList(failedList)
} }
} else { } else {
globals.SugarLogger.Debugf("==========IsSyncStatusNew := %d", 444)
isAdded2Update := false isAdded2Update := false
// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改 // 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil { if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
@@ -682,14 +677,6 @@ 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("============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("============priceList := %s", utils.Format4Output(priceList, false))
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int) step := batchItemList[0].(int)
@@ -1173,8 +1160,6 @@ func GetSensitiveWord(singleStoreHandler partner.ISingleStoreStoreSkuHandler, st
} }
func MergeSkuSaleStatusWithStoreOpTime(sku *dao.StoreSkuSyncInfo, storeDetail *dao.StoreDetail, now int16) (outStatus int) { func MergeSkuSaleStatusWithStoreOpTime(sku *dao.StoreSkuSyncInfo, storeDetail *dao.StoreDetail, now int16) (outStatus int) {
globals.SugarLogger.Debugf("==============MergeSkuSaleStatusWithStoreOpTime := %d", sku.MergedStatus)
globals.SugarLogger.Debugf("==============MergeSkuSaleStatusWithStoreOpTime := %v", sku.MergedStatus == model.SkuStatusNormal && sku.StatusSaleBegin > 0 && sku.StatusSaleEnd > 0 && storeDetail.Status == model.StoreStatusOpened)
if sku.MergedStatus == model.SkuStatusNormal && sku.StatusSaleBegin > 0 && sku.StatusSaleEnd > 0 && storeDetail.Status == model.StoreStatusOpened { if sku.MergedStatus == model.SkuStatusNormal && sku.StatusSaleBegin > 0 && sku.StatusSaleEnd > 0 && storeDetail.Status == model.StoreStatusOpened {
//商品可售时间的差集与门店营业时间的交集为不可售，其余为原本状态 //商品可售时间的差集与门店营业时间的交集为不可售，其余为原本状态
var openTime int16 var openTime int16

2
controllers/cms_sync.go
View File

@@ -3,7 +3,6 @@ package controllers
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
"github.com/panjf2000/ants" "github.com/panjf2000/ants"
"io" "io"
"sync" "sync"
@@ -39,7 +38,6 @@ func (c *SyncController) SyncStoresSkus() {
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.VendorIDs, &vendorIDs); err != nil { if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.VendorIDs, &vendorIDs); err != nil {
return retVal, "", err return retVal, "", err
} }
globals.SugarLogger.Debugf("============1")
retVal, err = cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, vendorIDs, storeIDs, skuIDs, params.IsForce, params.IsAsync, params.IsContinueWhenError) retVal, err = cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, vendorIDs, storeIDs, skuIDs, params.IsForce, params.IsAsync, params.IsContinueWhenError)
return retVal, "", err return retVal, "", err
}) })