From b36f3623f293ccfaec830d8e543ffe13afd3fac3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 28 Dec 2020 17:33:26 +0800
Subject: [PATCH] a

---
 business/jxstore/act/act.go | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/business/jxstore/act/act.go b/business/jxstore/act/act.go
index d2fa1d696..083a28e13 100644
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -781,6 +781,16 @@ func CancelAct(ctx *jxcontext.Context, actID int) (err error) {
 		return err
 	}
 	_, err = SyncAct(ctx, nil, actID, nil, false)
+	act := &model.Act{}
+	act.ID = actID
+	if err == nil {
+		if _, err = dao.UpdateEntityLogically(db, act,
+			map[string]interface{}{
+				model.FieldStatus: model.ActStatusCanceled,
+			}, ctx.GetUserName(), nil); err != nil {
+			return err
+		}
+	}
 	return err
 }
 
@@ -883,16 +893,16 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act
 	}
 
 	if isNeedCancelAct {
-		act := &model.Act{}
-		act.ID = actID
-		if err == nil {
-			if _, err = dao.UpdateEntityLogically(db, act,
-				map[string]interface{}{
-					model.FieldStatus: model.ActStatusCanceled,
-				}, ctx.GetUserName(), nil); err != nil {
-				return 0, err
-			}
-		}
+		// act := &model.Act{}
+		// act.ID = actID
+		// if err == nil {
+		// 	if _, err = dao.UpdateEntityLogically(db, act,
+		// 		map[string]interface{}{
+		// 			model.FieldStatus: model.ActStatusCanceled,
+		// 		}, ctx.GetUserName(), nil); err != nil {
+		// 		return 0, err
+		// 	}
+		// }
 	}
 	dao.Commit(db)
 	return originSyncStatus, err