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

果园发美团

Browse Source
This commit is contained in:
苏尹岚
2020-06-16 17:32:36 +08:00
parent 7f883e7742
commit 4645691c1b
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxstore/cms/sku.go
View File

@@ -2550,7 +2550,7 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
if toTimeP.Before(fromTimeP) { if toTimeP.Before(fromTimeP) {
return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP) return "", fmt.Errorf("结束时间不可以小于开始时间！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
} }
task := tasksch.NewParallelTask("RefreshOrdersPriceInfo", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, task := tasksch.NewParallelTask("UpdateSkuExinfoMap", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), 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) {
nameID := batchItemList[0].(int) nameID := batchItemList[0].(int)
skuEx := &model.SkuExinfoMap{ skuEx := &model.SkuExinfoMap{
@@ -2561,16 +2561,30 @@ func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark stri
BeginAt: fromTimeP, BeginAt: fromTimeP,
EndAt: toTimeP, EndAt: toTimeP,
} }
dao.WrapAddIDCULEntity(skuEx, ctx.GetUserName()) dao.WrapAddIDCULDEntity(skuEx, ctx.GetUserName())
skuExs, _ := dao.GetSkuExinfos(db, []int{nameID}, vendorID, "", utils.ZeroTimeValue, utils.ZeroTimeValue) skuExs, _ := dao.GetSkuExinfos(db, []int{nameID}, vendorID, "", utils.ZeroTimeValue, utils.ZeroTimeValue)
if len(skuExs) > 0 { if len(skuExs) > 0 {
skuEx2 := skuExs[0] skuEx2 := skuExs[0]
dao.WrapAddIDCULDEntity(skuEx2, ctx.GetUserName()) skuEx2.DeletedAt = time.Now()
dao.UpdateEntity(db, skuEx2) skuEx2.LastOperator = ctx.GetUserName()
dao.UpdateEntity(db, skuEx2, "DeletedAt", "LastOperator")
dao.CreateEntity(db, skuEx) dao.CreateEntity(db, skuEx)
} else { } else {
dao.CreateEntity(db, skuEx) dao.CreateEntity(db, skuEx)
} }
now := utils.Time2Date(time.Now())
if now.Sub(fromTimeP) >= 0 && now.Sub(toTimeP) <= 0 {
var skuIDs []int
skuList, err2 := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
if err = err2; err == nil {
if len(skuList) > 0 {
for _, v := range skuList {
skuIDs = append(skuIDs, v.ID)
}
CurVendorSync.SyncStoresSkus2(ctx, nil, 0, db, []int{vendorID}, nil, false, skuIDs, nil, model.SyncFlagModifiedMask, true, true)
}
}
}
return retVal, err return retVal, err
}, nameIDs) }, nameIDs)
tasksch.HandleTask(task, nil, true).Run() tasksch.HandleTask(task, nil, true).Run()

1
business/partner/delivery/mtps/waybill.go
View File

@@ -102,6 +102,7 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m
return mtpsapi.SuccessResponse return mtpsapi.SuccessResponse
} }
c.pushToGy(order, msg) c.pushToGy(order, msg)
globals.SugarLogger.Debugf("onWaybillMsg test, %v", msg)
return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) return mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus)
} }