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

- 启用新活动初始版本

Browse Source
This commit is contained in:
gazebo
2019-07-03 15:31:55 +08:00
parent 3bd645e937
commit e86ae6e096
10 changed files with 423 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,16 @@
package act
import (
"fmt"
"time"
"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"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
)
@@ -25,6 +28,17 @@ type ActDetail struct {
model.Act2
}
type ActMapPureInfo struct {
VendorID int `orm:"column(vendor_id)" json:"vendorID"`
VendorActID string `orm:"column(vendor_act_id);size(48)" json:"vendorActID"`
SyncStatus int `orm:"default(2)" json:"syncStatus"`
}
type ActVendorInfo struct {
model.Act
VendorList []*ActMapPureInfo
}
func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Act, vendorIDs []int, actStoreSku []*ActStoreSkuParam) (validVendorIDs []int, actStoreSkuList []*model.ActStoreSku, actStoreSkuMapList []*model.ActStoreSkuMap, err error) {
wholeValidVendorMap := make(map[int]int)
if len(actStoreSku) > 0 {
@@ -183,7 +197,7 @@ func AddActStoreBind(ctx *jxcontext.Context, actID int, actStoreSku []*ActStoreS
return err
}
func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules []*ActOrderRuleParam, actStoreSku []*ActStoreSkuParam) (actID int, err error) {
func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules []*ActOrderRuleParam, actStoreSku []*ActStoreSkuParam, isAsync bool) (hint string, err error) {
db := dao.GetDB()
dao.Begin(db)
@@ -201,12 +215,12 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
err = dao.CreateEntity(db, act)
if err != nil {
dao.Rollback(db)
return 0, err
return "", err
}
validVendorIDs, actStoreSkuList, actStoreSkuMapList, err := ActStoreSkuParam2Model(ctx, db, act, vendorIDs, actStoreSku)
if err != nil {
return 0, err
return "", err
}
var actMapList []*model.ActMap
@@ -224,27 +238,63 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules
err = dao.CreateMultiEntities(db, actMapList)
if err != nil {
dao.Rollback(db)
return 0, err
return "", err
}
}
if err = addActStoreBind(ctx, db, actStoreSkuList, actStoreSkuMapList); err != nil {
dao.Rollback(db)
return 0, err
return "", err
}
dao.Commit(db)
actID = act.ID
err = SyncAct(ctx, actID, nil, nil, nil)
return actID, err
hint, err = SyncAct(ctx, nil, act.ID, nil, nil, nil, isAsync)
if !isAsync {
hint = utils.Int2Str(act.ID)
}
return hint, err
}
func QueryActs(ctx *jxcontext.Context, actID int, keyword string, statusList []int, actTypeList []int, storeID, skuID int, beginAt, endAt time.Time) (actList []*model.Act, err error) {
return actList, err
func QueryActs(ctx *jxcontext.Context, actID int, offset, pageSize int, keyword string, statusList []int, actTypeList []int, storeID, skuID, cityCode int, beginAt, endAt, createdAtFrom, createdAtTo time.Time) (pagedInfo *dao.PagedActListInfo, err error) {
return dao.QueryActs(dao.GetDB(), actID, offset, pageSize, keyword, statusList, actTypeList, storeID, skuID, cityCode, beginAt, endAt, createdAtFrom, createdAtTo)
}
func GetActDetail(ctx *jxcontext.Context, actID int) (actDetail *ActDetail, err error) {
return actDetail, err
func GetActVendorInfo(ctx *jxcontext.Context, actID int) (actVendorInfo *ActVendorInfo, err error) {
db := dao.GetDB()
actMap, err := dao.GetActVendorInfo(db, actID, nil)
if err != nil {
return nil, err
}
if len(actMap) == 0 {
return nil, fmt.Errorf("不能找到活动:%d", actID)
}
actVendorInfo = &ActVendorInfo{}
for vendorID, v := range actMap {
if actVendorInfo.ID == 0 {
actVendorInfo.Act = v.Act
}
actVendorInfo.VendorList = append(actVendorInfo.VendorList, &ActMapPureInfo{
VendorID: vendorID,
SyncStatus: v.SyncStatus,
VendorActID: v.VendorActID,
})
}
return actVendorInfo, err
}
func GetActStoreSkuInfo(ctx *jxcontext.Context, actID int, vendorIDs []int) (actStoreSkuList []*model.ActStoreSku2, err error) {
db := dao.GetDB()
actStoreSkuMap, err := dao.GetActStoreSkuVendorInfo(db, actID, vendorIDs, nil, nil)
if err != nil {
return nil, err
}
if len(actStoreSkuMap) == 0 {
return nil, fmt.Errorf("不能找到活动:%d", actID)
}
for _, v := range actStoreSkuMap {
actStoreSkuList = append(actStoreSkuList, v...)
}
return actStoreSkuList, err
}
func CancelAct(ctx *jxcontext.Context, actID int) (err error) {
@@ -252,7 +302,7 @@ func CancelAct(ctx *jxcontext.Context, actID int) (err error) {
if err = deleteActStoreBind(ctx, db, actID, nil); err != nil {
return err
}
err = SyncAct(ctx, actID, nil, nil, nil)
_, err = SyncAct(ctx, nil, actID, nil, nil, nil, false)
return err
}
@@ -346,22 +396,37 @@ func deleteActStoreBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actSto
return err
}
func SyncAct(ctx *jxcontext.Context, actID int, vendorIDs, storeIDs, skuIDs []int) (err error) {
func SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITask, actID int, vendorIDs, storeIDs, skuIDs []int, isAsync bool) (hint string, err error) {
db := dao.GetDB()
actMap, err := dao.GetActVendorInfo(db, actID, vendorIDs)
if err != nil {
return err
return "", err
}
actStoreSkuMap, err := dao.GetActStoreSkuVendorInfo(db, actID, nil, storeIDs, skuIDs)
if err != nil {
return err
return "", err
}
for vendorID := range actMap {
if handler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformActHandler); handler != nil {
if err = handler.SyncAct(ctx, nil, actMap[vendorID], nil, actStoreSkuMap[vendorID]); err != nil {
return err
if vendorIDs == nil {
vendorIDs = partner.GetVendorIDsFromActMap(actMap)
}
task := tasksch.NewParallelTask("SyncAct", nil, ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
vendorID := batchItemList[0].(int)
if handler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformActHandler); handler != nil {
if err = handler.SyncAct(ctx, nil, actMap[vendorID], nil, actStoreSkuMap[vendorID]); err == nil {
retVal = []int{1}
}
}
return retVal, err
}, vendorIDs)
tasksch.HandleTask(task, parentTask, true).Run()
if !isAsync {
result, err2 := task.GetResult(0)
if err = err2; err == nil {
hint = utils.Int2Str(len(result))
}
} else {
hint = task.GetID()
}
return err
return hint, err
}

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

@@ -5,10 +5,10 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/testinit"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/globals"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
_ "git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
@@ -26,11 +26,7 @@ func TestInitDb(t *testing.T) {
}
func TestCreateAct(t *testing.T) {
actID, err := CreateAct(jxcontext.AdminCtx, &model.Act{
Name: "测试活动",
PricePercentage: 80,
Type: model.ActSkuDirectDown,
}, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}, nil, []*ActStoreSkuParam{
actStoreSkuList := []*ActStoreSkuParam{
&ActStoreSkuParam{
ActStoreSku: model.ActStoreSku{
StoreID: 100884,
@@ -55,7 +51,13 @@ func TestCreateAct(t *testing.T) {
SkuID: 22715,
},
},
})
}
// t.Log(utils.Format4Output(actStoreSkuList, true))
actID, err := CreateAct(jxcontext.AdminCtx, &model.Act{
Name: "测试活动",
PricePercentage: 80,
Type: model.ActSkuDirectDown,
}, []int{model.VendorIDJD, model.VendorIDMTWM, model.VendorIDEBAI}, nil, actStoreSkuList, false)
if err != nil {
t.Fatal(err)
}
@@ -134,7 +136,7 @@ func TestAddActStoreBind(t *testing.T) {
}
func TestSyncAct(t *testing.T) {
err := SyncAct(jxcontext.AdminCtx, 1, nil, nil, nil)
_, err := SyncAct(jxcontext.AdminCtx, nil, 1, nil, nil, nil, false)
if err != nil {
t.Fatal(err)
}