1
This commit is contained in:
@@ -17,7 +17,6 @@ import (
|
||||
"git.rosy.net.cn/jx-callback/business/partner"
|
||||
"git.rosy.net.cn/jx-callback/business/partner/putils"
|
||||
"git.rosy.net.cn/jx-callback/globals"
|
||||
"git.rosy.net.cn/jx-callback/globals/api"
|
||||
)
|
||||
|
||||
func actType2Txd(actType int) *int64 {
|
||||
@@ -130,14 +129,15 @@ func storeSku2ActData4Delete(actStoreSku []*model.ActStoreSku2, handler func(int
|
||||
}
|
||||
|
||||
//删除活动的商品详情
|
||||
func actSku2Delete(actIDs []string) (map[string]domain.AlibabaRetailMarketingItemdiscountActivitySkuDeleteItemDiscountActivityElementOperateRequest, error) {
|
||||
func actSku2Delete(actIDs []string, vendorOrgCode, vendorStoreID string) (map[string]domain.AlibabaRetailMarketingItemdiscountActivitySkuDeleteItemDiscountActivityElementOperateRequest, error) {
|
||||
var (
|
||||
SkuElement []domain.AlibabaRetailMarketingItemdiscountActivitySkuDeleteSkuActivityElementDto
|
||||
deData = make(map[string]domain.AlibabaRetailMarketingItemdiscountActivitySkuDeleteItemDiscountActivityElementOperateRequest, 0)
|
||||
)
|
||||
for _, v := range actIDs {
|
||||
i := utils.Str2Int64(v)
|
||||
if skus, err := api.TaoVegetableApi.ActivitySkuQuery(i); err == nil {
|
||||
//if skus, err := api.TaoVegetableApi.ActivitySkuQuery(i); err == nil {
|
||||
if skus, err := getAPI(vendorOrgCode, 0, vendorStoreID).ActivitySkuQuery(i); err == nil {
|
||||
//查询商品
|
||||
for _, sku := range skus {
|
||||
SkuElement = append(SkuElement, domain.AlibabaRetailMarketingItemdiscountActivitySkuDeleteSkuActivityElementDto{
|
||||
@@ -145,7 +145,7 @@ func actSku2Delete(actIDs []string) (map[string]domain.AlibabaRetailMarketingIte
|
||||
})
|
||||
}
|
||||
//查询活动详情
|
||||
act, err := api.TaoVegetableApi.ActivityQuery(i, "")
|
||||
act, err := getAPI(vendorOrgCode, 0, vendorStoreID).ActivityQuery(i, "")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -175,7 +175,7 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
||||
if globals.EnableMtwmStoreWrite {
|
||||
globals.SugarLogger.Debugf("进入创建活动")
|
||||
//创建活动
|
||||
actID, err1 := api.TaoVegetableApi.ActivityCreate(*actData)
|
||||
actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData)
|
||||
globals.SugarLogger.Debugf("createOneShopAct actData=%s,err=%v", utils.Format4Output(actData, false), err1)
|
||||
if err1 != nil || actID == 0 {
|
||||
failedList = append(failedList, &partner.StoreSkuInfoWithErr{
|
||||
@@ -188,7 +188,7 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
||||
}
|
||||
//活动增加商品
|
||||
actSkuData.ActId = &actID
|
||||
err3, successSkuCode, failSkuCode := api.TaoVegetableApi.ActivitySkuCreate(*actSkuData)
|
||||
err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData)
|
||||
globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err=%v", utils.Format4Output(actSkuData, false), err3)
|
||||
err = err3
|
||||
actStoreSkuMap := make(map[int]*model.ActStoreSku2)
|
||||
@@ -227,14 +227,14 @@ func cancelOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode
|
||||
actStoreSkuMap[v.VendorActID] = v
|
||||
}
|
||||
//查找删除的活动商品
|
||||
sku2Delete, err := actSku2Delete(list)
|
||||
sku2Delete, err := actSku2Delete(list, act.VendorOrgCode, vendorStoreID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
//删除活动以及商品
|
||||
for k, v := range sku2Delete {
|
||||
if err = api.TaoVegetableApi.ActivitySkuDelete(v); err == nil {
|
||||
err = api.TaoVegetableApi.ActivityDelete(*v.CreatorId, *v.CreatorName, utils.Str2Int64(k))
|
||||
if err = getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuDelete(v); err == nil {
|
||||
err = getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*v.CreatorId, *v.CreatorName, utils.Str2Int64(k))
|
||||
}
|
||||
if err != nil {
|
||||
failedList = append(failedList, &partner.StoreSkuInfoWithErr{
|
||||
|
||||
Reference in New Issue
Block a user