diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 00ad28b1c..bba7cb4ec 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -572,7 +572,7 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act } act := actMap[partner.GetVendorIDsFromActMap(actMap)[0]] if act.Status != model.ActStatusCreated || time.Now().Sub(act.EndAt) > 0 { - return fmt.Errorf("当前活动状态:%s不能进行此操作,或已过期", model.ActStatusName[act.Status]) + return fmt.Errorf("当前活动状态:%s,不能进行此操作,或已过期", model.ActStatusName[act.Status]) } dao.Begin(db) @@ -584,7 +584,6 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act } } }() - actStoreSkuParamMap := make(map[int64]*ActStoreSkuParam) for _, v := range actStoreSkuParam { actStoreSkuParamMap[jxutils.Combine2Int(v.StoreID, v.SkuID)] = v diff --git a/controllers/act.go b/controllers/act.go index 05a1fef11..a4291e120 100644 --- a/controllers/act.go +++ b/controllers/act.go @@ -231,16 +231,20 @@ func (c *ActController) UpdateActStoreSkuBind() { if len(actStoreSkuAddList) > 0 { if err = act.AddActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuAddList); err != nil { dao.Rollback(db) + return } } if len(actStoreSkuDeleteList) > 0 { if err = act.DeleteActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuDeleteList); err != nil { dao.Rollback(db) + return } } dao.Commit(db) }() - retVal, err = act.SyncAct(params.Ctx, nil, params.ActID, nil, nil, nil, params.IsAsync) + if err == nil { + retVal, err = act.SyncAct(params.Ctx, nil, params.ActID, nil, nil, nil, params.IsAsync) + } } } return retVal, "", err