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
2023-01-13 16:26:00 +08:00
parent 68b6afe0df 598a957113
commit d4adc41b0d
6 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -458,7 +458,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
}
}
}
orders, _, err = dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, true, nil, false, "", mapParams, 0, model.UnlimitedPageSize)
orders, _, err = dao.GetOrders(dao.GetDB(), nil, true, true, fromDateStr, toDateStr, false, nil, false, "", mapParams, 0, model.UnlimitedPageSize)
case 1:
afsSkuMap, err = c.getAfsOrderSkuInfo4ExportOrders(ctx, fromDateStr, toDateStr)
case 2:

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

@@ -1707,7 +1707,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
if (storeMap.DeliveryFeeDeductionFee > 0 || utils.Str2Int(storeMap.YbStorePrefix) > 0) && vendorID == model.VendorIDDD {
DDFlag = true
}
globals.SugarLogger.Debugf("ddflag=========%v", DDFlag)
if DDFlag {
globals.SugarLogger.Debug("进入DDFlag 特殊处理运费模板、起送价、打包费")
if err := tiktok_store.SpecialTreat(storeMap.VendorOrgCode, utils.Str2Int64(storeMap.VendorStoreID), int64(storeMap.StoreID), int64(storeMap.DeliveryFeeDeductionFee), utils.Str2Int64(storeMap.YbStorePrefix)); err != nil {

4
business/jxstore/cms/store_sku.go
View File

@@ -1728,13 +1728,13 @@ func UpdateStoresSkus(ctx *jxcontext.Context, causeFlag int, storeIDs []int, sku
if !flag {
var num int64
db := dao.GetDB()
skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale, isRefreshHigh)
skuIDs, err := updateStoresSkusWithoutSync(ctx, db, storeIDs, skuBindInfos, isScale, isRefreshHigh) // 这个方法再通知京东创建商品
if err != nil {
return "", err
}
isAsync = asyncStoreSkuOpFilter(ctx, isAsync)
num = int64(len(skuIDs))
if num > 0 {
if num > 0 { // 这个方法非京东的创建商品,京东的改为同步库存,上下架等!
hint, err = CurVendorSync.SyncStoresSkus(ctx, nil, causeFlag, db, nil, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
}
if num == 0 || !isAsync || hint == "" {

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

@@ -184,9 +184,11 @@ func SyncStoreSkuNew2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFla
switch step {
case 0:
if singleStoreHandler != nil {
globals.SugarLogger.Debugf("==SyncStoreCategories===")
_, err = SyncStoreCategories(ctx, task, vendorID, storeID, vendorStoreID, nameIDs, skuIDs, false, isContinueWhenError)
}
case 1:
globals.SugarLogger.Debugf("==syncStoreSkuNew===")
err = syncStoreSkuNew(ctx, task, causeFlag, false, vendorID, storeID, vendorOrgCode, nameIDs, skuIDs, excludeSkuIDs, useVendorPriceDirectly, isContinueWhenError)
}
return result, err
@@ -215,8 +217,10 @@ func FullSyncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
}
case 1:
if singleStoreHandler != nil {
// 同步分类在同步商品
_, err = SyncStoreSkuNew(ctx, task, 0, vendorID, storeID, vendorStoreID, "", nil, nil, excludeSkuIDs, false, isContinueWhenError)
} else {
// 直接同步商品
err = syncStoreSkuNew(ctx, task, 0, true, vendorID, storeID, "", nil, nil, excludeSkuIDs, false, isContinueWhenError)
}
}
@@ -474,6 +478,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
} else {
skus, err = dao.GetStoreSkus(db, vendorID, storeID, skuIDs)
}
if err != nil || len(skus) == 0 {
return err
}
@@ -538,10 +543,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
if singleStoreHandler == nil {
if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
// todo 多平台商品库没有正常创建，直接跳过
// 这是打的补,可以删除掉感觉
//if sku.VendorOrgCode == "379599" { // 水果的果切
// createList = append(createList, sku)
//}
} else {
sku.SkuSyncStatus |= model.SyncFlagSaleMask | model.SyncFlagPriceMask
bareSku = storeSkuSyncInfo2Bare(sku)
@@ -700,6 +701,18 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
// api.JdShop2API.SetCookieWithStr(configs[0].Value)
// }
}
if storeID == 668767 {
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))
globals.SugarLogger.Debugf("updateItems=== %s", utils.Format4Output(updateItems, false))
globals.SugarLogger.Debugf("reorderSkuMap=== %s", utils.Format4Output(reorderSkuMap, 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)

1
business/partner/purchase/tiktok_store/store.go
View File

@@ -1030,7 +1030,6 @@ type RelInfo struct {
func ToStringSlice(actual interface{}) ([]string, error) {
var res []string
value := reflect.ValueOf(actual)
globals.SugarLogger.Debugf("value.Kind()=========%s", value.Kind())
if value.Kind() != reflect.Slice || value.Kind() != reflect.Array {
return nil, errors.New("parse error")
}

1
business/partner/purchase/tiktok_store/warehouse.go
View File

@@ -300,7 +300,6 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc
}
} else { //更新为起送价模板
if updateSaleLimitID, err := UpdateTradeLimitTemplate(vendorOrgCode, bindSaleLimitID, minPrice); err != nil {
globals.SugarLogger.Debugf("进入更新门店起送价限售模板,minPrice=======%d", minPrice)
errList.AddErr(fmt.Errorf("更新门店起送价限售模板失败：%v", err))
} else {
FreightTemplate.TradeLimitID = updateSaleLimitID