From ba56ec84c60223c7060e7c39dbef14da01d49b30 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 12 Jul 2019 17:09:42 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E5=8F=AA=E6=9C=89=E5=9C=A8=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=EF=BC=8C=E4=B8=94=E6=B2=A1=E6=9C=89=E7=BB=88?= =?UTF-8?q?=E7=BB=93=E7=9A=84=E6=B4=BB=E5=8A=A8=E6=89=8D=E8=83=BD=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=95=86=E5=93=81=E6=B4=BB=E5=8A=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/act/act.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go index 5cbc82679..215f90293 100644 --- a/business/jxstore/act/act.go +++ b/business/jxstore/act/act.go @@ -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)