From 5de19b77633ad9cead3083d0b8baa1a59229069a Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Jul 2023 14:27:34 +0800 Subject: [PATCH 1/4] 1 --- business/partner/purchase/tao_vegetable/act.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index 3a3cfea4b..929cb05e9 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -103,7 +103,7 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle OutActId: utils.String2Pointer(utils.Int2Str(v.ActID)), } - sType := actType2Txd(v.Type) + sType := actType2Txd(act.Type) globals.SugarLogger.Debugf("sType=%d", sType) switch sType { case tao_vegetable.DiscountTypeDeductMoney: From 51e09711da48c51bd0c9752b0df9b67c90b7d6e7 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Jul 2023 14:34:01 +0800 Subject: [PATCH 2/4] 1 --- business/partner/purchase/tao_vegetable/act.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index 929cb05e9..0d0c33aa7 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -215,6 +215,10 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData) globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err=%v", utils.Format4Output(actSkuData, false), err3) err = err3 + if err != nil { //商品新增失败，回滚删除创建的活动 + err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID) + globals.SugarLogger.Debugf("createOneShopAct rollback delete act err=%v", err4) + } actStoreSkuMap := make(map[int]*model.ActStoreSku2) for _, v := range actStoreSku { actStoreSkuMap[v.SkuID] = v From 59c452fe023e7bfc2cb6607eadf8c6c5448b4a32 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Jul 2023 14:45:24 +0800 Subject: [PATCH 3/4] 1 --- business/partner/purchase/tao_vegetable/act.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index 0d0c33aa7..eeefe4359 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -213,7 +213,7 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode //活动增加商品 actSkuData.ActId = &actID err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData) - globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err=%v", utils.Format4Output(actSkuData, false), err3) + globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err3=%v", utils.Format4Output(actSkuData, false), err3) err = err3 if err != nil { //商品新增失败，回滚删除创建的活动 err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID) From 49c2e851c60d9c8a1ba5f4929eae838e1a15a5e9 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Mon, 10 Jul 2023 14:52:05 +0800 Subject: [PATCH 4/4] 1 --- business/partner/purchase/tao_vegetable/act.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index eeefe4359..3ce9c6cc0 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -295,9 +295,12 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { list := batchItemList[0].([]*model.ActStoreSku2) + globals.SugarLogger.Debugf("我在这里4") failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list) + globals.SugarLogger.Debugf("我在这里6，failedList=%s, err2=%v", utils.Format4Output(failedList, false), err2) if err = err2; err2 == nil { if len(failedList) > 0 { + globals.SugarLogger.Debugf("我在这里5") failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList) list = []*model.ActStoreSku2{} for _, v := range actStoreSku {