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

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

Browse Source
This commit is contained in:
richboo111
2022-11-17 18:22:48 +08:00
parent 8ba129bc22 d1f82af749
commit c06e6a565c
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,7 +450,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} else { } else {
skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs) skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
} }
globals.SugarLogger.Debugf("skus := %d", len(skus))
if err != nil || len(skus) == 0 { if err != nil || len(skus) == 0 {
return err return err
} }
@@ -473,7 +472,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler) storeSkuHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformStoreSkuHandler)
reorderHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IStoreSkuSorter) reorderHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IStoreSkuSorter)
globals.SugarLogger.Debugf("=======singleStoreHandler %s", utils.Format4Output(singleStoreHandler, false))
var ( var (
createList, updateList []*dao.StoreSkuSyncInfo createList, updateList []*dao.StoreSkuSyncInfo
deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo deleteList, stockList, onlineList, offlineList, priceList []*partner.StoreSkuInfo
@@ -492,16 +490,12 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
sku.VendorPrice = 0 sku.VendorPrice = 0
} }
sku.MergedStatus = MergeSkuSaleStatusWithStoreOpTime(sku, storeDetail, now) 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 { if vendorID == model.VendorIDMTWM && storeDetail.Status != model.StoreStatusOpened && storeDetail.AutoEnableAt != nil && storeDetail.AutoEnableAt.Sub(specailAutoEnableAt) == 0 && sku.MergedStatus == model.SkuStatusNormal {
sku.MergedStatus = model.SkuStatusDontSale sku.MergedStatus = model.SkuStatusDontSale
globals.SugarLogger.Debugf("==============2 %d", sku.MergedStatus)
} }
if sku.Status != model.SkuStatusNormal { if sku.Status != model.SkuStatusNormal {
sku.MergedStatus = model.SkuStatusDontSale sku.MergedStatus = model.SkuStatusDontSale
globals.SugarLogger.Debugf("==============3 %d", sku.MergedStatus)
} }
globals.SugarLogger.Debugf("==============4 %d", sku.MergedStatus)
var bareSku *partner.StoreSkuInfo var bareSku *partner.StoreSkuInfo
isNeedReorder := false isNeedReorder := false
if isStoreSkuSyncNeedDelete(sku) { if isStoreSkuSyncNeedDelete(sku) {

2
business/model/dao/store_sku.go
View File

@@ -688,8 +688,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
sql = fmt.Sprintf(sql, fmtParams...) sql = fmt.Sprintf(sql, fmtParams...)
sql += " ORDER BY t1.price" 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 { if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
return nil, err return nil, err
} }