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

GetFixDirectDownAct

Browse Source
This commit is contained in:
gazebo
2020-01-16 12:05:00 +08:00
parent 9777cb13b6
commit a74bd7d839
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/partner/purchase/ebai/store_sku2.go
View File

@@ -465,12 +465,12 @@ func SelectStoreSkuListByOpResult(storeSkuList []*partner.StoreSkuInfo, opResult
func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
for _, v := range storeSkuList { for _, v := range storeSkuList {
if vendorActID, err2 := createOneShopAct(putils.GetFixDirectDownAct(storeID, v.SkuID), utils.Int2Str(storeID), putils.StoreSku2ActStoreSku([]*partner.StoreSkuInfo{v})); err2 != nil { if vendorActID, err2 := createOneShopAct(putils.GetFixDirectDownAct(vendorOrgCode, storeID, v.SkuID), utils.Int2Str(storeID), putils.StoreSku2ActStoreSku([]*partner.StoreSkuInfo{v})); err2 != nil {
failedList = append(failedList, &partner.StoreSkuInfoWithErr{ failedList = append(failedList, &partner.StoreSkuInfoWithErr{
StoreSkuInfo: v, StoreSkuInfo: v,
VendoreID: model.VendorIDJD, VendoreID: model.VendorIDJD,
StoreID: storeID, StoreID: storeID,
ErrMsg: err.Error(), ErrMsg: err2.Error(),
}) })
} else { } else {
v.VendorActID = vendorActID v.VendorActID = vendorActID
@@ -486,7 +486,7 @@ func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode strin
StoreSkuInfo: v, StoreSkuInfo: v,
VendoreID: model.VendorIDJD, VendoreID: model.VendorIDJD,
StoreID: storeID, StoreID: storeID,
ErrMsg: err.Error(), ErrMsg: err2.Error(),
}) })
} }
} }

8
business/partner/purchase/jd/store_sku2.go
View File

@@ -264,12 +264,12 @@ func SelectStoreSkuListByResponseList(storeSkuList []*partner.StoreSkuInfo, resp
func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
for _, v := range storeSkuList { for _, v := range storeSkuList {
if vendorActID, err2 := createSkuAct(ctx, putils.GetFixDirectDownAct(storeID, v.SkuID), putils.StoreSku2ActStoreSku([]*partner.StoreSkuInfo{v})); err2 != nil { if vendorActID, err2 := createSkuAct(ctx, putils.GetFixDirectDownAct(vendorOrgCode, storeID, v.SkuID), putils.StoreSku2ActStoreSku([]*partner.StoreSkuInfo{v})); err2 != nil {
failedList = append(failedList, &partner.StoreSkuInfoWithErr{ failedList = append(failedList, &partner.StoreSkuInfoWithErr{
StoreSkuInfo: v, StoreSkuInfo: v,
VendoreID: model.VendorIDJD, VendoreID: model.VendorIDJD,
StoreID: storeID, StoreID: storeID,
ErrMsg: err.Error(), ErrMsg: err2.Error(),
}) })
} else { } else {
v.VendorActID = vendorActID v.VendorActID = vendorActID
@@ -280,12 +280,12 @@ func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCo
func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
for _, v := range storeSkuList { for _, v := range storeSkuList {
if err2 := cancelSkuAct(ctx, putils.GetFixDirectDownAct(storeID, v.SkuID), v.VendorActID); err2 != nil { if err2 := cancelSkuAct(ctx, putils.GetFixDirectDownAct(vendorOrgCode, storeID, v.SkuID), v.VendorActID); err2 != nil {
failedList = append(failedList, &partner.StoreSkuInfoWithErr{ failedList = append(failedList, &partner.StoreSkuInfoWithErr{
StoreSkuInfo: v, StoreSkuInfo: v,
VendoreID: model.VendorIDJD, VendoreID: model.VendorIDJD,
StoreID: storeID, StoreID: storeID,
ErrMsg: err.Error(), ErrMsg: err2.Error(),
}) })
} }
} }

4
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -580,9 +580,9 @@ func SelectStoreSkuListByFoodList(storeSkuList interface{}, foodList []*mtwmapi.
} }
func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CreateStoreSkusAct(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
return createOneShopAct(putils.GetFixDirectDownAct(storeID, 0), vendorStoreID, putils.StoreSku2ActStoreSku(storeSkuList)) return createOneShopAct(putils.GetFixDirectDownAct(vendorOrgCode, storeID, 0), vendorStoreID, putils.StoreSku2ActStoreSku(storeSkuList))
} }
func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CancelActs(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, storeSkuList []*partner.StoreSkuInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
return cancelOneShopAct(putils.GetFixDirectDownAct(storeID, 0), vendorStoreID, putils.StoreSku2ActStoreSku(storeSkuList)) return cancelOneShopAct(putils.GetFixDirectDownAct(vendorOrgCode, storeID, 0), vendorStoreID, putils.StoreSku2ActStoreSku(storeSkuList))
} }

3
business/partner/putils/store_sku.go
View File

@@ -354,7 +354,7 @@ func StoreSku2ActStoreSku(storeSkuList []*partner.StoreSkuInfo) (actStoreSku []*
return actStoreSku return actStoreSku
} }
func GetFixDirectDownAct(storeID, skuID int) (act *model.Act2) { func GetFixDirectDownAct(vendorOrgCode string, storeID, skuID int) (act *model.Act2) {
name := fmt.Sprintf("自动直降活动%d:%d:%d", storeID, skuID, time.Now().Unix()) name := fmt.Sprintf("自动直降活动%d:%d:%d", storeID, skuID, time.Now().Unix())
act = &model.Act2{ act = &model.Act2{
Act: model.Act{ Act: model.Act{
@@ -367,6 +367,7 @@ func GetFixDirectDownAct(storeID, skuID int) (act *model.Act2) {
BeginAt: utils.Time2Date(time.Now()), BeginAt: utils.Time2Date(time.Now()),
EndAt: utils.Time2Date(time.Now().Add(365 * 24 * time.Hour)), EndAt: utils.Time2Date(time.Now().Add(365 * 24 * time.Hour)),
}, },
VendorOrgCode: vendorOrgCode,
} }
return act return act
} }