- 只有在有效期,且没有终结的活动才能进行商品活动调整

This commit is contained in:
gazebo
2019-07-12 17:09:42 +08:00
parent 03209daec3
commit ba56ec84c6

View File

@@ -216,8 +216,8 @@ func AddActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actSto
return err
}
}
if act.Status != model.ActStatusCreated {
return fmt.Errorf("当前活动状态:%s不能进行此操作", model.ActStatusName[act.Status])
if act.Status != model.ActStatusCreated || time.Now().Sub(act.EndAt) > 0 {
return fmt.Errorf("当前活动状态:%s不能进行此操作,或已过期", model.ActStatusName[act.Status])
}
_, actStoreSkuList, actStoreSkuMapList, err := ActStoreSkuParam2Model(ctx, db, act, vendorIDs, actStoreSku)
@@ -549,8 +549,8 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act
return err
}
act := actMap[partner.GetVendorIDsFromActMap(actMap)[0]]
if act.Status != model.ActStatusCreated {
return fmt.Errorf("当前活动状态:%s不能进行此操作", model.ActStatusName[act.Status])
if act.Status != model.ActStatusCreated || time.Now().Sub(act.EndAt) > 0 {
return fmt.Errorf("当前活动状态:%s不能进行此操作,或已过期", model.ActStatusName[act.Status])
}
dao.Begin(db)