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

- 平台门店名存储原始全名

Browse Source
This commit is contained in:
gazebo
2019-09-03 11:22:16 +08:00
parent 14ce826e6e
commit 23e9adc86e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1436,7 +1436,7 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
CloseTime2: store.CloseTime2, CloseTime2: store.CloseTime2,
DeliveryType: store.DeliveryType, DeliveryType: store.DeliveryType,
StoreName: store.Name, StoreName: store.OriginalName,
}} }}
} }
} }
@@ -1446,7 +1446,6 @@ func GetStoresVendorSnapshot(ctx *jxcontext.Context, parentTask tasksch.ITask, v
tasksch.HandleTask(task, parentTask, true).Run() tasksch.HandleTask(task, parentTask, true).Run()
resultList, err := task.GetResult(0) resultList, err := task.GetResult(0)
if len(resultList) > 0 { if len(resultList) > 0 {
err = nil // 强制忽略
for _, v := range resultList { for _, v := range resultList {
dao.WrapAddIDCULDEntity(v, ctx.GetUserName()) dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
vendorStoreSnapshotList = append(vendorStoreSnapshotList, v.(*model.VendorStoreSnapshot)) vendorStoreSnapshotList = append(vendorStoreSnapshotList, v.(*model.VendorStoreSnapshot))
@@ -1741,8 +1740,9 @@ func SaveAndSendAlarmVendorSnapshot(ctx *jxcontext.Context, vendorIDs, storeIDs
prevSnapshotAt := getCurrentSnapshotAt(curSnapshotAt.Add(-1 * time.Second)) prevSnapshotAt := getCurrentSnapshotAt(curSnapshotAt.Add(-1 * time.Second))
db := dao.GetDB() db := dao.GetDB()
var curSnapshotList, prevSnapshotList []*model.VendorStoreSnapshot var curSnapshotList, prevSnapshotList []*model.VendorStoreSnapshot
task := tasksch.NewSeqTask("SaveAndSendAlarmVendorSnapshot", ctx, task := tasksch.NewParallelTask("SaveAndSendAlarmVendorSnapshot", tasksch.NewParallelConfig().SetIsContinueWhenError(true).SetParallelCount(1), ctx,
func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
step := batchItemList[0].(int)
switch step { switch step {
case 0: case 0:
curSnapshotList, err = GetStoresVendorSnapshot(ctx, task, vendorIDs, storeIDs) curSnapshotList, err = GetStoresVendorSnapshot(ctx, task, vendorIDs, storeIDs)
@@ -1759,7 +1759,7 @@ func SaveAndSendAlarmVendorSnapshot(ctx *jxcontext.Context, vendorIDs, storeIDs
err = SendAlarmVendorSnapshot(ctx, task, prevSnapshotList, curSnapshotList) err = SendAlarmVendorSnapshot(ctx, task, prevSnapshotList, curSnapshotList)
} }
return nil, err return nil, err
}, 4) }, []int{0, 1, 2, 3})
tasksch.ManageTask(task).Run() tasksch.ManageTask(task).Run()
if !isAsync { if !isAsync {
_, err = task.GetResult(0) _, err = task.GetResult(0)