liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- ebai.SyncAct

Browse Source
This commit is contained in:
gazebo
2019-07-02 13:36:16 +08:00
parent 4c6ebce30d
commit 9df7461b5b
4 changed files with 244 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
business/jxstore/act/act.go
View File

@@ -165,8 +165,27 @@ func AddActStoreBind(ctx *jxcontext.Context, actID int, actStoreSku []*ActStoreS
if err != nil {
return err
}
err = addActStoreBind(ctx, db, actStoreSkuList, actStoreSkuMapList)
dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
if r != nil {
panic(r)
}
}
}()
if err = addActStoreBind(ctx, db, actStoreSkuList, actStoreSkuMapList); err != nil {
return err
}
for _, act := range actMap {
if _, err = dao.UpdateEntityLogically(db, partner.Act2ActMap(act),
map[string]interface{}{
model.FieldSyncStatus: act.SyncStatus | model.SyncFlagModifiedMask,
}, ctx.GetUserName(), nil); err != nil {
return err
}
}
dao.Commit(db)
return err
}
@@ -194,7 +213,7 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
}
var actMapList []*model.ActMap
for vendorID := range validVendorIDs {
for _, vendorID := range validVendorIDs {
actMap := &model.ActMap{
ActID: act.ID,
VendorID: vendorID,

34
business/jxstore/act/act_test.go
View File

@@ -29,29 +29,29 @@ func TestCreateAct(t *testing.T) {
actID, err := CreateAct(jxcontext.AdminCtx, &model.Act{
Name: "测试活动",
PricePercentage: 80,
}, []int{0}, nil, []*ActStoreSkuParam{
}, []int{model.VendorIDEBAI}, nil, []*ActStoreSkuParam{
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100119,
SkuID: 30828,
StoreID: 100884,
SkuID: 22716,
},
},
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100119,
SkuID: 30827,
StoreID: 100884,
SkuID: 22717,
},
},
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30592,
StoreID: 100920,
SkuID: 22714,
},
},
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30565,
StoreID: 100920,
SkuID: 22715,
},
},
})
@@ -84,14 +84,14 @@ func TestDeleteActStoreBind(t *testing.T) {
// },
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30592,
StoreID: 100884,
SkuID: 22716,
},
},
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30565,
StoreID: 100884,
SkuID: 22717,
},
},
})
@@ -116,14 +116,14 @@ func TestAddActStoreBind(t *testing.T) {
// },
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30592,
StoreID: 100884,
SkuID: 22716,
},
},
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100118,
SkuID: 30565,
StoreID: 100884,
SkuID: 22717,
},
},
})