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

1

Browse Source
This commit is contained in:
邹宗楠
2023-06-30 09:48:06 +08:00
parent 61295e66ec
commit c86dc205f9
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/model/sku.go
View File

@@ -132,7 +132,7 @@ type SkuCategory struct {
EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别 EbaiCategoryID int64 `orm:"column(ebai_category_id)" json:"ebaiCategoryID"` // 这个是指对应的饿百商品类别
MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别 MtwmCategoryID int64 `orm:"column(mtwm_category_id)" json:"mtwmCategoryID"` // 这个是指对应的美团外卖商品类别
DdCategoryID int64 `orm:"column(dd_category_id)" json:"ddCategoryID"` // 这个是指对应的抖音外卖商品类别 DdCategoryID int64 `orm:"column(dd_category_id)" json:"ddCategoryID"` // 这个是指对应的抖音外卖商品类别
TaoCategoryID int64 `orm:"column(tao_category_id)" json:"taoCategoryID"` // 这个是指对应的抖音外卖商品类别 TaoCategoryID int64 `orm:"column(tao_category_id)" json:"taoCategoryID"` // 这个是指对应的淘宝商品类别
YbCategoryID int64 `orm:"column(yb_category_id)" json:"ybCategoryID"` // 这个是指对应的银豹商品类别 YbCategoryID int64 `orm:"column(yb_category_id)" json:"ybCategoryID"` // 这个是指对应的银豹商品类别
JdsCategoryID int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"` // 这个是指对应的京东商城类别 JdsCategoryID int64 `orm:"column(jds_category_id)" json:"jdsCategoryID"` // 这个是指对应的京东商城类别
GoMeiCategoryID int64 `orm:"column(go_mei_category_id)" json:"goMeiCategoryID"` // 这个是指对应的国美商城类别 GoMeiCategoryID int64 `orm:"column(go_mei_category_id)" json:"goMeiCategoryID"` // 这个是指对应的国美商城类别

24
business/partner/purchase/tao_vegetable/store_sku2.go
View File

@@ -113,6 +113,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
Code: utils.String2Pointer(utils.Int2Str(storeCat.StoreCatID)), Code: utils.String2Pointer(utils.Int2Str(storeCat.StoreCatID)),
Name: &storeCat.StoreCatName, Name: &storeCat.StoreCatName,
}}) }})
globals.SugarLogger.Debugf("CreateStoreCategory=====err := %v", err)
if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && storeCat.StoreCatName != "" { // 修改分类名，但分类不存在 if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && storeCat.StoreCatName != "" { // 修改分类名，但分类不存在
storeCat.CatSyncStatus |= model.SyncFlagNewMask storeCat.CatSyncStatus |= model.SyncFlagNewMask
skuCode, err := api.AddStoreCategoryInfo(&request.AlibabaWdkSkuCategoryAddRequest{Param: &domain.AlibabaWdkSkuCategoryAddCategoryDo{ skuCode, err := api.AddStoreCategoryInfo(&request.AlibabaWdkSkuCategoryAddRequest{Param: &domain.AlibabaWdkSkuCategoryAddCategoryDo{
@@ -121,6 +122,7 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in
ParentCode: utils.String2Pointer(utils.Int2Str(storeCat.ParentID)), ParentCode: utils.String2Pointer(utils.Int2Str(storeCat.ParentID)),
Leaf: utils.Bool2Point(false), Leaf: utils.Bool2Point(false),
}}) }})
globals.SugarLogger.Debugf("AddStoreCategoryInfo=====err := %v", err)
if err != nil { if err != nil {
return err return err
} }
@@ -179,11 +181,15 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) {
func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false) failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false)
globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", err)
globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", failedList)
return failedList, err return failedList, err
} }
func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) {
failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, true) failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, true)
globals.SugarLogger.Debugf("CreateStoreSkus=====err := %v", err)
globals.SugarLogger.Debugf("CreateStoreSkus=====err := %v", failedList)
return failedList, err return failedList, err
} }
@@ -204,7 +210,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
failedList, err = UpdateTaoVegetable(api, storeSkuList, vendorStoreID, storeID, syncType) failedList, err = UpdateTaoVegetable(api, storeSkuList, vendorStoreID, storeID, syncType)
globals.SugarLogger.Debugf("更新淘鲜达商品异常:%s", err.Error()) globals.SugarLogger.Debugf("更新淘鲜达商品异常:%s", err.Error())
} }
globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", err)
globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", failedList)
return failedList, err return failedList, err
} }
@@ -244,7 +251,8 @@ func UpdateTaoVegetable(api *tao_vegetable.API, storeSkuList []*dao.StoreSkuSync
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
} }
} }
globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", err)
globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", failedList)
return failedList, err return failedList, err
} }
@@ -357,7 +365,8 @@ func createTaoVegetable(api *tao_vegetable.API, storeSkuList []*dao.StoreSkuSync
param = make([]domain585.AlibabaWdkSkuAddSkuDo, 0, 0) param = make([]domain585.AlibabaWdkSkuAddSkuDo, 0, 0)
} }
} }
globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", err)
globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", failedList)
return failedList, nil return failedList, nil
} }
@@ -414,6 +423,8 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
} }
} }
globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", err)
globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", failedList)
return failedList, err return failedList, err
//param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ //param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{
// StoreId: utils.String2Pointer(vendorStoreID), // StoreId: utils.String2Pointer(vendorStoreID),
@@ -466,6 +477,8 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
} }
} }
globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", err)
globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", failedList)
return failedList, err return failedList, err
} }
@@ -496,6 +509,8 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg
updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0)
} }
} }
globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", err)
globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", failedList)
return failedList, err return failedList, err
} }
@@ -530,7 +545,8 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
param.BatchStockPublishDto = nil param.BatchStockPublishDto = nil
} }
} }
globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", err)
globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", failedList)
return failedList, err return failedList, err
} }

16
globals/api/apimanager/apimanager.go
View File

@@ -2,6 +2,7 @@ package apimanager
import ( import (
"git.rosy.net.cn/baseapi/platformapi/jdapi" "git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/platformapi/tao_vegetable"
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -63,7 +64,20 @@ func (a *APIManager) GetAPI(vendorID int, appOrgCode string) (pfAPI interface{})
pfAPI = api.Mtwm2API pfAPI = api.Mtwm2API
} }
case model.VendorIDTaoVegetable: case model.VendorIDTaoVegetable:
pfAPI = api.TaoVegetableApi api := api.TaoVegetableApi
if beego.BConfig.RunMode == "dev" {
api.SetToken("50002C00414zMSClqLiSDjBr2N19748391yiazjtFmsgTOdbBftik0XDfkUQywSmcjfC")
} else if api == nil || api.GetToken() == "" {
codes, _ := dao.GetVendorOrgCode(db, vendorID, appOrgCode, "platform")
if len(codes) == 0 {
return nil
}
code := codes[0]
api = tao_vegetable.NewTaoVegetable(code.AppKey, code.AppSecret, beego.AppConfig.DefaultString("taoVegetableServerUrl", ""))
api.SetToken(code.Token)
}
pfAPI = api
case model.VendorIDEBAI: case model.VendorIDEBAI:
pfAPI = api.EbaiAPI pfAPI = api.EbaiAPI
case model.VendorIDJDShop: case model.VendorIDJDShop: