- 活动调整，DeleteAct改名为CancelAct

business/jxstore/act/act.go

@@ -4,11 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/globals"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
@@ -16,6 +15,10 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 )
 
+const (
+	ActionTypeNA = 0
+)
+
 type ActOrderRuleParam struct {
 	SalePrice   int64 `orm:"" json:"salePrice"`   // 满的价格
 	DeductPrice int64 `orm:"" json:"deductPrice"` // 减的价格
@@ -164,11 +167,9 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
 	dao.WrapAddIDCULDEntity(act, ctx.GetUserName())
 	dao.Begin(db)
 	defer func() {
-		if r := recover(); r != nil || err != nil {
+		if r := recover(); r != nil {
 			dao.Rollback(db)
-			if r != nil {
-				panic(r)
-			}
+			panic(r)
 		}
 	}()
 	err = dao.CreateEntity(db, act)
@@ -186,15 +187,19 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
 		if len(utils.Interface2Slice(list)) > 0 {
 			err = dao.CreateMultiEntities(db, list)
 			if err != nil {
+				dao.Rollback(db)
 				return 0, err
 			}
 			isEmptyAct = false
 		}
 	}
 	if isEmptyAct {
+		dao.Rollback(db)
 		return 0, fmt.Errorf("没有门店及SKU满足需求，空操作")
 	}
 	dao.Commit(db)
+	actID = act.ID
+	err = SyncAct(ctx, actID, nil, nil, nil)
 	return actID, err
 }
 
@@ -218,11 +223,42 @@ func GetActDetail(ctx *jxcontext.Context, actID int) (actDetail *ActDetail, err
 // 	return err
 // }
 
+func parseActStoreSkuParam(actStoreSku []*ActStoreSkuParam) {
+
+}
+
 func UpdateAct(ctx *jxcontext.Context, act *model.Act, actRules []*ActOrderRuleParam, actStoreSku []*ActStoreSkuParam) (err error) {
 	return err
 }
 
-func DeleteAct(ctx *jxcontext.Context, actID int) (err error) {
+func CancelAct(ctx *jxcontext.Context, actID int) (err error) {
+	db := dao.GetDB()
+	act := &model.Act{}
+	act.ID = actID
+	if err = dao.GetEntity(db, act); err != nil {
+		return err
+	}
+	dao.Begin(db)
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db)
+			panic(r)
+		}
+	}()
+
+	dao.UpdateEntityLogically(db, act, map[string]interface{}{
+		model.FieldStatus: model.ActStatusCanceled,
+	}, ctx.GetUserName(), nil)
+	_, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.ActMap{}, nil, ctx.GetUserName(), map[string]interface{}{
+		model.FieldActID: actID,
+	}, model.FieldSyncStatus, model.SyncFlagModifiedMask)
+	if err == nil {
+		dao.Commit(db)
+		globals.SugarLogger.Debugf("CancelAct track:%s", ctx.GetTrackInfo())
+		err = SyncAct(ctx, actID, nil, nil, nil)
+	} else {
+		dao.Rollback(db)
+	}
 	return err
 }
 
@@ -260,15 +296,15 @@ func SyncAct(ctx *jxcontext.Context, actID int, vendorIDs, storeIDs, skuIDs []in
 				// globals.SugarLogger.Debugf("%s", utils.Format4Output(actStore, false))
 				// globals.SugarLogger.Debugf("%s", utils.Format4Output(actStoreSku, false))
 				if act != nil && actStore != nil && actStoreSku != nil {
-					if model.IsSyncStatusNeedDelete(act.SyncStatus) {
-						if !dao.IsVendorThingIDEmpty(act.VendorActID) {
-						}
-					} else if model.IsSyncStatusNeedCreate(act.SyncStatus) {
-						globals.SugarLogger.Debug("fuck")
+					if model.IsSyncStatusNeedCreate(act.SyncStatus) {
 						err = handler.CreateAct(ctx, task, act, actOrderRules, actStore, actStoreSku)
-					} else /*if model.IsSyncStatusNeedUpdate(act.SyncStatus)*/ {
-						actStoreMap2Remove, actStoreMap2Add, actStoreMap2Update := splitActStore(actStore)
-						err = handler.UpdateAct(ctx, task, act, actOrderRules, actStoreMap2Remove, actStoreMap2Add, actStoreMap2Update, actStoreSku)
+					} else if model.IsSyncStatusNeedUpdate(act.SyncStatus) {
+						if act.Status == model.ActStatusCanceled {
+							err = handler.CancelAct(ctx, task, act, actStore, actStoreSku)
+						} else {
+							// actStoreMap2Remove, actStoreMap2Add, actStoreMap2Update := splitActStore(actStore)
+							// err = handler.UpdateAct(ctx, task, act, actOrderRules, actStoreMap2Remove, actStoreMap2Add, actStoreMap2Update, actStoreSku)
+						}
 					}
 					if err == nil {
 						actMap := &model.ActMap{}

business/jxstore/act/act_test.go

@@ -53,6 +53,13 @@ func TestCreateAct(t *testing.T) {
 	globals.SugarLogger.Debug(actID)
 }
 
+func TestCancelAct(t *testing.T) {
+	err := CancelAct(jxcontext.AdminCtx, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestSyncAct(t *testing.T) {
 	err := SyncAct(jxcontext.AdminCtx, 1, nil, nil, nil)
 	if err != nil {