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

Merge remote-tracking branch 'origin/mark' into don

Browse Source
This commit is contained in:
Rosy-zhudan
2019-08-01 17:17:36 +08:00
parent 66c3b86762 046c8beef9
commit 016bd553e3
3 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,7 +343,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
switch step { switch step {
case 0: case 0:
if len(deleteList) > 0 { if len(deleteList) > 0 {
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
var successList []*partner.StoreSkuInfo var successList []*partner.StoreSkuInfo
if successList, err = singleStoreHandler.DeleteStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuNotExist(err) { if successList, err = singleStoreHandler.DeleteStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuNotExist(err) {
err = nil err = nil
@@ -359,10 +359,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
} }
case 1: case 1:
if len(createList) > 0 { if len(createList) > 0 {
_, err = putils.FreeBatchStoreSkuSyncInfo(func(batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuSyncInfo(func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) {
var successList []*dao.StoreSkuSyncInfo var successList []*dao.StoreSkuSyncInfo
if successList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) { if successList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) {
if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, nil, storeID, vendorStoreID, []*partner.StoreSkuInfo{ if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, []*partner.StoreSkuInfo{
&partner.StoreSkuInfo{ &partner.StoreSkuInfo{
SkuID: batchedStoreSkuList[0].SkuID, SkuID: batchedStoreSkuList[0].SkuID,
}, },
@@ -386,7 +386,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
} }
case 2: case 2:
if len(updateList) > 0 { if len(updateList) > 0 {
_, err = putils.FreeBatchStoreSkuSyncInfo(func(batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuSyncInfo(func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, err error) {
var successList []*dao.StoreSkuSyncInfo var successList []*dao.StoreSkuSyncInfo
if successList, err = singleStoreHandler.UpdateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { if successList, err = singleStoreHandler.UpdateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil {
successList = batchedStoreSkuList successList = batchedStoreSkuList
@@ -400,7 +400,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
case 3: case 3:
for k, list := range [][]*partner.StoreSkuInfo{stockList /*, onlineList*/} { for k, list := range [][]*partner.StoreSkuInfo{stockList /*, onlineList*/} {
if len(list) > 0 { if len(list) > 0 {
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
var successList []*partner.StoreSkuInfo var successList []*partner.StoreSkuInfo
if successList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { if successList, err = storeSkuHandler.UpdateStoreSkusStock(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil {
successList = batchedStoreSkuList successList = batchedStoreSkuList
@@ -420,7 +420,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
status = model.SkuStatusDontSale status = model.SkuStatusDontSale
} }
if len(statusList) > 0 { if len(statusList) > 0 {
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
var successList []*partner.StoreSkuInfo var successList []*partner.StoreSkuInfo
if successList, err = storeSkuHandler.UpdateStoreSkusStatus(ctx, storeID, vendorStoreID, batchedStoreSkuList, status); err == nil { if successList, err = storeSkuHandler.UpdateStoreSkusStatus(ctx, storeID, vendorStoreID, batchedStoreSkuList, status); err == nil {
successList = batchedStoreSkuList successList = batchedStoreSkuList
@@ -433,7 +433,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
} }
case 6: case 6:
if len(priceList) > 0 { if len(priceList) > 0 {
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
var successList []*partner.StoreSkuInfo var successList []*partner.StoreSkuInfo
if successList, err = storeSkuHandler.UpdateStoreSkusPrice(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil { if successList, err = storeSkuHandler.UpdateStoreSkusPrice(ctx, storeID, vendorStoreID, batchedStoreSkuList); err == nil {
successList = batchedStoreSkuList successList = batchedStoreSkuList
@@ -484,7 +484,7 @@ func PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, ven
} }
case 1: case 1:
if len(sku2Delete) > 0 { if len(sku2Delete) > 0 {
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
_, err = handler.DeleteStoreSkus(ctx, storeID, vendorStoreID, sku2Delete) _, err = handler.DeleteStoreSkus(ctx, storeID, vendorStoreID, sku2Delete)
return nil, err return nil, err
}, ctx, parentTask, sku2Delete, handler.GetStoreSkusBatchSize(partner.FuncDeleteStoreSkus), isContinueWhenError) }, ctx, parentTask, sku2Delete, handler.GetStoreSkusBatchSize(partner.FuncDeleteStoreSkus), isContinueWhenError)

53
business/jxstore/misc/misc2.go
View File

@@ -2,41 +2,42 @@ package misc
import ( import (
"time" "time"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/cms" "git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/putils" "git.rosy.net.cn/jx-callback/business/partner/putils"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
) )
const ( const (
specialSkuName = "温馨提示" specialSkuName = "温馨提示"
startOpStoreStockNumber = 0 startOpStoreStockNumber = 0
endOpStoreStockNumber = model.MaxStoreSkuStockQty endOpStoreStockNumber = model.MaxStoreSkuStockQty
startOpStoreTimeDefaultMTWM = int16(2200) startOpStoreTimeDefaultMTWM = int16(2200)
endOpStoreTimeDefaultMTWM = int16(2355) endOpStoreTimeDefaultMTWM = int16(2355)
startOpStoreTimeDefaultEBAI = int16(5) startOpStoreTimeDefaultEBAI = int16(5)
endOpStoreTimeDefaultEBAI = int16(2355) endOpStoreTimeDefaultEBAI = int16(2355)
) )
var ( var (
startOpStoreTimeListJXCS = []string { startOpStoreTimeListJXCS = []string{
"22:10:00", "22:10:00",
} }
endOpStoreTimeListJXCS = []string { endOpStoreTimeListJXCS = []string{
"06:10:00", "06:10:00",
} }
startOpStoreTimeListJXGY = []string { startOpStoreTimeListJXGY = []string{
"22:00:00", "22:00:00",
} }
endOpStoreTimeListJXGY = []string { endOpStoreTimeListJXGY = []string{
"06:00:00", "06:00:00",
} }
vendorList = map[int]bool { vendorList = map[int]bool{
model.VendorIDMTWM: true, model.VendorIDMTWM: true,
model.VendorIDEBAI: true, model.VendorIDEBAI: true,
} }
@@ -74,7 +75,7 @@ func FilterSkuNameList(storeSkuNameList []*partner.SkuNameInfo) (filterStoreSkuN
for _, skuNameInfo := range storeSkuNameList { for _, skuNameInfo := range storeSkuNameList {
if skuNameInfo.Name != specialSkuName { if skuNameInfo.Name != specialSkuName {
filterStoreSkuNameList = append(filterStoreSkuNameList, skuNameInfo) filterStoreSkuNameList = append(filterStoreSkuNameList, skuNameInfo)
} }
} }
return filterStoreSkuNameList return filterStoreSkuNameList
} }
@@ -92,7 +93,7 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
storeListValue := batchItemList[0].(*cms.StoreExt) storeListValue := batchItemList[0].(*cms.StoreExt)
storeID := storeListValue.ID storeID := storeListValue.ID
if storeListValue.StoreMaps != nil { if storeListValue.StoreMaps != nil {
for _, vendorListValue := range storeListValue.StoreMaps { for _, vendorListValue := range storeListValue.StoreMaps {
vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"])) vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
if _, ok := vendorList[vendorID]; ok { if _, ok := vendorList[vendorID]; ok {
startOpStoreTime, endOpStoreTime := GetOpStoreTime(vendorID) startOpStoreTime, endOpStoreTime := GetOpStoreTime(vendorID)
@@ -107,7 +108,7 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
storeSkuNameList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil) storeSkuNameList, err := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, nil)
if err != nil { if err != nil {
baseapi.SugarLogger.Errorf("StartOrEndOpStore GetStoreSkusFullInfo error:%v storeID:%d vendorID:%d vendorStoreID:%s", err, storeID, vendorID, vendorStoreID) baseapi.SugarLogger.Errorf("StartOrEndOpStore GetStoreSkusFullInfo error:%v storeID:%d vendorID:%d vendorStoreID:%s", err, storeID, vendorID, vendorStoreID)
} else { } else {
filterStoreSkuNameList := FilterSkuNameList(storeSkuNameList) filterStoreSkuNameList := FilterSkuNameList(storeSkuNameList)
storeSkuList := putils.StoreSkuFullList2Bare(filterStoreSkuNameList) storeSkuList := putils.StoreSkuFullList2Bare(filterStoreSkuNameList)
if len(storeSkuList) > 0 { if len(storeSkuList) > 0 {
@@ -115,8 +116,8 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
AddOrDelExtraStoreOptime(vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, false) AddOrDelExtraStoreOptime(vendorID, storeID, vendorStoreID, &storeListValue.Store, startOpStoreTime, endOpStoreTime, false)
} }
_, err = putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { _, err = putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
for _, skuValue := range batchedStoreSkuList { for _, skuValue := range batchedStoreSkuList {
skuValue.Stock = GetStockValue(isStart) skuValue.Stock = GetStockValue(isStart)
} }
//var successList []*partner.StoreSkuInfo //var successList []*partner.StoreSkuInfo
@@ -160,17 +161,17 @@ func StartOrEndOpStore(isStart bool, startTime, endTime int16, isAsync, isContin
func InitEx() { func InitEx() {
if globals.IsMainProductEnv() { if globals.IsMainProductEnv() {
ScheduleTimerFunc(func() { ScheduleTimerFunc(func() {
StartOrEndOpStore(true, 0, 0, false, true) StartOrEndOpStore(true, 0, 0, false, true)
}, startOpStoreTimeListJXCS) }, startOpStoreTimeListJXCS)
ScheduleTimerFunc(func() { ScheduleTimerFunc(func() {
StartOrEndOpStore(false, 0, 0, false, true) StartOrEndOpStore(false, 0, 0, false, true)
}, endOpStoreTimeListJXCS) }, endOpStoreTimeListJXCS)
} else { } else {
ScheduleTimerFunc(func() { ScheduleTimerFunc(func() {
StartOrEndOpStore(true, 0, 0, false, true) StartOrEndOpStore(true, 0, 0, false, true)
}, startOpStoreTimeListJXGY) }, startOpStoreTimeListJXGY)
ScheduleTimerFunc(func() { ScheduleTimerFunc(func() {
StartOrEndOpStore(false, 0, 0, false, true) StartOrEndOpStore(false, 0, 0, false, true)
}, endOpStoreTimeListJXGY) }, endOpStoreTimeListJXGY)
} }
} }

4
business/partner/purchase/jd/store_sku2.go
View File

@@ -65,8 +65,8 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context,
} }
func (p *PurchaseHandler) GetStoreSkusBareInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*partner.StoreSkuInfo) (outStoreSkuList []*partner.StoreSkuInfo, err error) { func (p *PurchaseHandler) GetStoreSkusBareInfo(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorStoreID string, inStoreSkuList []*partner.StoreSkuInfo) (outStoreSkuList []*partner.StoreSkuInfo, err error) {
result, err := putils.FreeBatchStoreSkuInfo(func(batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) { result, err := putils.FreeBatchStoreSkuInfo(func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, err error) {
list, err := p.getStoreSkusBareInfoLimitSize(ctx, nil, storeID, vendorStoreID, batchedStoreSkuList) list, err := p.getStoreSkusBareInfoLimitSize(ctx, task, storeID, vendorStoreID, batchedStoreSkuList)
if err == nil { if err == nil {
result = list result = list
} }