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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-07-10 15:47:38 +08:00
parent a5d02d9d5a 49c2e851c6
commit 7e20531ce0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
business/partner/purchase/tao_vegetable/act.go
View File

@@ -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:
@@ -213,8 +213,12 @@ 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)
globals.SugarLogger.Debugf("createOneShopAct rollback delete act err=%v", err4)
}
actStoreSkuMap := make(map[int]*model.ActStoreSku2)
for _, v := range actStoreSku {
actStoreSkuMap[v.SkuID] = v
@@ -291,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 {