- refactor jxcontent and tasksch (remove dependency from jxcontent to tasksch)

- send dingding msg to user when async task finished
2019-03-22 15:04:28 +08:00
parent 0f5445020a
commit 25ac631c5c
31 changed files with 1527 additions and 1488 deletions
--- a/business/jxstore/promotion/jd_promotion.go
+++ b/business/jxstore/promotion/jd_promotion.go
@@ -424,64 +424,66 @@ func CreateJdPromotion(ctx *jxcontext.Context, isIDJd bool, isAsync, isContinueW
 		}
 		dao.Commit(db)

-		rootTask := tasksch.NewSeqTask("CreateJdPromotion", userName, func(task *tasksch.SeqTask, step int, params2 ...interface{}) (result interface{}, err error) {
-			if step == 0 {
-				task1 := tasksch.NewParallelTask("CreateJdPromotion update sku price", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
-					storeID := batchItemList[0].(int)
-					modifyPricesList := jxutils.SplitSlice(modifyPricesList[storeID], jdapi.MaxStoreSkuBatchSize)
-					for _, modifyPrices := range modifyPricesList {
-						modifyPrices2 := make([]*jdapi.SkuPriceInfo, len(modifyPrices))
-						for k, v := range modifyPrices {
-							modifyPrices2[k] = v.(*jdapi.SkuPriceInfo)
-						}
-						if globals.EnableStoreWrite {
-							if _, err = api.JdAPI.UpdateVendorStationPrice(utils.Int2Str(storeID), "", modifyPrices2); err != nil {
-								return nil, err
+		rootTask := tasksch.NewSeqTask("CreateJdPromotion", ctx,
+			func(task *tasksch.SeqTask, step int, params2 ...interface{}) (result interface{}, err error) {
+				if step == 0 {
+					task1 := tasksch.NewParallelTask("CreateJdPromotion update sku price", nil, ctx,
+						func(t *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
+							storeID := batchItemList[0].(int)
+							modifyPricesList := jxutils.SplitSlice(modifyPricesList[storeID], jdapi.MaxStoreSkuBatchSize)
+							for _, modifyPrices := range modifyPricesList {
+								modifyPrices2 := make([]*jdapi.SkuPriceInfo, len(modifyPrices))
+								for k, v := range modifyPrices {
+									modifyPrices2[k] = v.(*jdapi.SkuPriceInfo)
+								}
+								if globals.EnableStoreWrite {
+									if _, err = api.JdAPI.UpdateVendorStationPrice(utils.Int2Str(storeID), "", modifyPrices2); err != nil {
+										return nil, err
+									}
+								}
 							}
+							return nil, nil
+						}, jxStoreIDs)
+					task.AddChild(task1).Run()
+					_, err = task1.GetResult(0)
+				} else if step == 1 {
+					err = promotionHandler.CreatePromotionRules(infoId, "", limitDevice, limitPin, limitCount, limitDaily)
+				} else if step == 2 {
+					task2 := tasksch.NewParallelTask("CreateJdPromotion CreatePromotionSku", tasksch.NewParallelConfig().SetBatchSize(MaxPromotionSkuCount).SetIsContinueWhenError(isContinueWhenError), ctx,
+						func(task *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
+							skus := make([]map[string]interface{}, len(batchItemList))
+							for k, v := range batchItemList {
+								skus[k] = v.(map[string]interface{})
+							}
+							_, err = promotionHandler.CreatePromotionSku(infoId, "", skus)
+							return nil, err
+						}, promotionPrices)
+					task.AddChild(task2).Run()
+					_, err = task2.GetResult(0)
+					if isContinueWhenError && err != nil { // todo isContinueWhenError为true时，强制忽略此步的错误
+						err = nil
+					}
+				} else if step == 3 {
+					err = promotionHandler.ConfirmPromotion(infoId, "")
+					if err == nil {
+						db := dao.GetDB()
+						if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
+							model.FieldStatus: model.PromotionStatusRemoteCreated,
+						}, ctx.GetUserName(), nil); err == nil {
+							RefreshJdPromotionLockStatus(ctx, promotion.ID)
 						}
 					}
-					return nil, nil
-				}, jxStoreIDs)
-				task.AddChild(task1).Run()
-				_, err = task1.GetResult(0)
-			} else if step == 1 {
-				err = promotionHandler.CreatePromotionRules(infoId, "", limitDevice, limitPin, limitCount, limitDaily)
-			} else if step == 2 {
-				task2 := tasksch.NewParallelTask("CreateJdPromotion CreatePromotionSku", tasksch.NewParallelConfig().SetBatchSize(MaxPromotionSkuCount).SetIsContinueWhenError(isContinueWhenError), userName, func(task *tasksch.ParallelTask, batchItemList []interface{}, params2 ...interface{}) (retVal interface{}, err error) {
-					skus := make([]map[string]interface{}, len(batchItemList))
-					for k, v := range batchItemList {
-						skus[k] = v.(map[string]interface{})
-					}
-					_, err = promotionHandler.CreatePromotionSku(infoId, "", skus)
-					return nil, err
-				}, promotionPrices)
-				task.AddChild(task2).Run()
-				_, err = task2.GetResult(0)
-				if isContinueWhenError && err != nil { // todo isContinueWhenError为true时，强制忽略此步的错误
-					err = nil
 				}
-			} else if step == 3 {
-				err = promotionHandler.ConfirmPromotion(infoId, "")
-				if err == nil {
+				if err != nil {
 					db := dao.GetDB()
-					if _, err = dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
-						model.FieldStatus: model.PromotionStatusRemoteCreated,
-					}, ctx.GetUserName(), nil); err == nil {
-						RefreshJdPromotionLockStatus(ctx, promotion.ID)
-					}
+					dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
+						model.FieldStatus: model.PromotionStatusRemoteFailed,
+						model.FieldRemark: err.Error(),
+					}, ctx.GetUserName(), nil)
 				}
-			}
-			if err != nil {
-				db := dao.GetDB()
-				dao.UpdateEntityLogically(db, promotion, map[string]interface{}{
-					model.FieldStatus: model.PromotionStatusRemoteFailed,
-					model.FieldRemark: err.Error(),
-				}, ctx.GetUserName(), nil)
-			}
-			return nil, err
-		}, 4)
-		ctx.SetTaskOrAddChild(rootTask, nil)
-		tasksch.ManageTask(rootTask).Run()
+				return nil, err
+			}, 4)
+		tasksch.HandleTask(rootTask, nil, true).Run()
 		if !isAsync {
 			_, err = rootTask.GetResult(0)
 		}
@@ -745,32 +747,33 @@ func RefreshJdStoreSkuStock(promotionID int, skuIDs []int) (err error) {
 	}
 	globals.SugarLogger.Debugf("RefreshJdStoreSkuStock promotionID:%d, len(promotionItemList)=%d", promotionID, len(promotionItemList))
 	if len(promotionItemList) > 0 {
-		task := tasksch.NewParallelTask("RefreshJdStoreSkuStock", tasksch.NewParallelConfig().SetBatchSize(jdapi.MaxStoreSkuBatchSize).SetIsContinueWhenError(true), "schedule", func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-			stockList := make([]*jdapi.SkuStock, 0)
-			stationNo := batchItemList[0].(*tPromotionItemInfo).JdStoreID
-			for _, v := range batchItemList {
-				promotionItem := v.(*tPromotionItemInfo)
-				if promotionItem.JdStoreID != stationNo {
-					// globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false))
-					_, err = api.JdAPI.BatchUpdateCurrentQtys("", stationNo, stockList, userName)
-					if err != nil {
-						globals.SugarLogger.Warnf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys failed with error:%v", err)
+		task := tasksch.NewParallelTask("RefreshJdStoreSkuStock", tasksch.NewParallelConfig().SetBatchSize(jdapi.MaxStoreSkuBatchSize).SetIsContinueWhenError(true), jxcontext.AdminCtx,
+			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+				stockList := make([]*jdapi.SkuStock, 0)
+				stationNo := batchItemList[0].(*tPromotionItemInfo).JdStoreID
+				for _, v := range batchItemList {
+					promotionItem := v.(*tPromotionItemInfo)
+					if promotionItem.JdStoreID != stationNo {
+						// globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false))
+						_, err = api.JdAPI.BatchUpdateCurrentQtys("", stationNo, stockList, userName)
+						if err != nil {
+							globals.SugarLogger.Warnf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys failed with error:%v", err)
+						}
+						stockList = make([]*jdapi.SkuStock, 0)
+						stationNo = promotionItem.JdStoreID
 					}
-					stockList = make([]*jdapi.SkuStock, 0)
-					stationNo = promotionItem.JdStoreID
+					stockList = append(stockList, &jdapi.SkuStock{
+						OutSkuId: utils.Int2Str(promotionItem.SkuID),
+						StockQty: model.MaxStoreSkuStockQty,
+					})
 				}
-				stockList = append(stockList, &jdapi.SkuStock{
-					OutSkuId: utils.Int2Str(promotionItem.SkuID),
-					StockQty: model.MaxStoreSkuStockQty,
-				})
-			}
-			// globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false))
-			_, err = api.JdAPI.BatchUpdateCurrentQtys("", stationNo, stockList, userName)
-			if err != nil {
-				globals.SugarLogger.Warnf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys failed with error:%v", err)
-			}
-			return nil, err
-		}, promotionItemList)
+				// globals.SugarLogger.Debugf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys stationNo:%s, stockList:%s", stationNo, utils.Format4Output(stockList, false))
+				_, err = api.JdAPI.BatchUpdateCurrentQtys("", stationNo, stockList, userName)
+				if err != nil {
+					globals.SugarLogger.Warnf("RefreshJdStoreSkuStock BatchUpdateCurrentQtys failed with error:%v", err)
+				}
+				return nil, err
+			}, promotionItemList)
 		task.Run()
 		_, err = task.GetResult(0)
 	}
--- a/business/jxstore/promotion/promotion.go
+++ b/business/jxstore/promotion/promotion.go
@@ -65,22 +65,22 @@ func SendAdvertingByGoodsOrder(ctx *jxcontext.Context, advertising string, days
 	mobileNumbers = append(mobileNumbers, "18180948107")

 	smsClient := aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
-	task := tasksch.NewParallelTask("SendAdvertingByGoodsOrder", tasksch.NewParallelConfig().SetBatchSize(MaxBatchSize), userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-		numbers := make([]string, len(batchItemList))
-		for k, v := range batchItemList {
-			numbers[k] = v.(string)
-		}
-		numberStr := strings.Join(numbers, ",")
-		_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, numberStr, "京西菜市", "SMS_109345355", string(utils.MustMarshal(map[string]interface{}{
-			"code": "code",
-		})))
-		if err != nil {
-			globals.SugarLogger.Infof("SendAdvertingByGoodsOrder numbers:%s failed with error:%v", numberStr, err)
-		}
-		return nil, err
-	}, mobileNumbers)
-	ctx.SetTaskOrAddChild(task, nil)
-	tasksch.ManageTask(task).Run()
+	task := tasksch.NewParallelTask("SendAdvertingByGoodsOrder", tasksch.NewParallelConfig().SetBatchSize(MaxBatchSize), ctx,
+		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+			numbers := make([]string, len(batchItemList))
+			for k, v := range batchItemList {
+				numbers[k] = v.(string)
+			}
+			numberStr := strings.Join(numbers, ",")
+			_, err = smsClient.Execute(globals.AliKey, globals.AliSecret, numberStr, "京西菜市", "SMS_109345355", string(utils.MustMarshal(map[string]interface{}{
+				"code": "code",
+			})))
+			if err != nil {
+				globals.SugarLogger.Infof("SendAdvertingByGoodsOrder numbers:%s failed with error:%v", numberStr, err)
+			}
+			return nil, err
+		}, mobileNumbers)
+	tasksch.HandleTask(task, nil, true).Run()

 	if !isAsync {
 		_, err = task.GetResult(0)