diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 456cd8857..29121952f 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -2068,12 +2068,17 @@ func GetUnionJobOrderInfo(ctx *jxcontext.Context, jobOrderID int) (getUnionJobOr return getUnionJobOrderInfoResult, err } -func GetVendorMatters(ctx *jxcontext.Context, vendorID int, vendorCatID, keyword string, page, pageSize, sortType int, listID string) (result *partner.MatterList, err error) { +func GetVendorMatters(ctx *jxcontext.Context, vendorID int, vendorCatID, keyword string, offset, pageSize, sortType int, listID string) (result *partner.MatterList, err error) { handler := partner.GetHandler(vendorID) - return handler.GetUnionMatterList(ctx, vendorCatID, keyword, page, pageSize, sortType, listID) + return handler.GetUnionMatterList(ctx, vendorCatID, keyword, offset/pageSize+1, pageSize, sortType, listID) } func GetVendorMatterDetail(ctx *jxcontext.Context, vendorID int, goodsID string) (goodsDetail *partner.GoodsDetail, err error) { handler := partner.GetHandler(vendorID) return handler.GetUnionMatterDetail(ctx, goodsID) } + +func GetVendorMatterRcmmd(ctx *jxcontext.Context, vendorID int, goodsID string, rcmmdType, offset, pageSize int) (result *partner.MatterList, err error) { + handler := partner.GetHandler(vendorID) + return handler.GetUnionMatterListRcmmd(ctx, goodsID, rcmmdType, offset, pageSize) +} diff --git a/business/jxstore/partner/jds/union.go b/business/jxstore/partner/jds/union.go index 9accf918f..27d4bde9a 100644 --- a/business/jxstore/partner/jds/union.go +++ b/business/jxstore/partner/jds/union.go @@ -37,3 +37,7 @@ func (s *UnionHandler) GetUnionMatterList(ctx *jxcontext.Context, vendorCatID, k func (s *UnionHandler) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID string) (result *partner.GoodsDetail, err error) { return nil, err } + +func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (result *partner.MatterList, err error) { + return nil, err +} diff --git a/business/jxstore/partner/mt/union.go b/business/jxstore/partner/mt/union.go index 46b46ef99..020da2337 100644 --- a/business/jxstore/partner/mt/union.go +++ b/business/jxstore/partner/mt/union.go @@ -56,3 +56,7 @@ func (s *UnionHandler) GetUnionMatterList(ctx *jxcontext.Context, vendorCatID, k func (s *UnionHandler) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID string) (result *partner.GoodsDetail, err error) { return nil, err } + +func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (result *partner.MatterList, err error) { + return nil, err +} diff --git a/business/jxstore/partner/partner.go b/business/jxstore/partner/partner.go index cede3e338..562ab6df7 100644 --- a/business/jxstore/partner/partner.go +++ b/business/jxstore/partner/partner.go @@ -84,6 +84,7 @@ type UnionInterface interface { CreateUnionPosition(ctx *jxcontext.Context, userID string) (sID string, err error) GetUnionMatterList(ctx *jxcontext.Context, vendorCatID, keyword string, page, pageSize, sortType int, listID string) (result *MatterList, err error) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID string) (result *GoodsDetail, err error) + GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (result *MatterList, err error) } func GetHandler(vendorID int) UnionInterface { diff --git a/business/jxstore/partner/pdd/union.go b/business/jxstore/partner/pdd/union.go index 606e7b4bc..b7aaa57ec 100644 --- a/business/jxstore/partner/pdd/union.go +++ b/business/jxstore/partner/pdd/union.go @@ -133,3 +133,32 @@ func (s *UnionHandler) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID stri } return result, err } + +func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (list *partner.MatterList, err error) { + var ( + goodsList []*partner.GoodsList + ) + list = &partner.MatterList{} + if goods, err2 := api.PddAPI.GoodsRecommendGet(goodsID, rcmmdType, offset, pageSize); err2 != nil { + return nil, err2 + } else { + list.ListID = goods.ListID + list.TotalCount = goods.Total + list.VendorID = model.VendorIDPDD + for _, v := range goods.List { + good := &partner.GoodsList{ + GoodsID: v.GoodsSign, + GoodsName: v.GoodsName, + Img: v.GoodsThumbnailURL, + CouponDiscount: v.CouponDiscount, + CouponRemainQuantity: v.CouponRemainQuantity, + MinNormalPrice: v.MinNormalPrice, + SalesCount: v.SalesTip, + PromotionRate: v.PromotionRate, + } + goodsList = append(goodsList, good) + } + list.GoodsList = goodsList + } + return nil, err +} diff --git a/business/jxstore/partner/taobao/union.go b/business/jxstore/partner/taobao/union.go index 0ebb51108..cc8975ed3 100644 --- a/business/jxstore/partner/taobao/union.go +++ b/business/jxstore/partner/taobao/union.go @@ -54,3 +54,7 @@ func (s *UnionHandler) GetUnionMatterList(ctx *jxcontext.Context, vendorCatID, k func (s *UnionHandler) GetUnionMatterDetail(ctx *jxcontext.Context, goodsID string) (result *partner.GoodsDetail, err error) { return nil, err } + +func (s *UnionHandler) GetUnionMatterListRcmmd(ctx *jxcontext.Context, goodsID string, rcmmdType, offset, pageSize int) (result *partner.MatterList, err error) { + return nil, err +} diff --git a/controllers/job_controller.go b/controllers/job_controller.go index 4d10d4eb0..d60f35c80 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -617,7 +617,7 @@ func (c *JobController) GetVendorMatterCategory() { // @Param vendorID query int true "平台ID" // @Param vendorCatID query string false "平台分类ID" // @Param keyword query string false "关键字" -// @Param page query int false "页码" +// @Param offset query int false "页码" // @Param pageSize query int false "页大小" // @Param listID query string false "分页用" // @Param sortType query int false "排序类型" @@ -626,7 +626,7 @@ func (c *JobController) GetVendorMatterCategory() { // @router /GetVendorMatters [get] func (c *JobController) GetVendorMatters() { c.callGetVendorMatters(func(params *tJobGetVendorMattersParams) (retVal interface{}, errCode string, err error) { - retVal, err = cms.GetVendorMatters(params.Ctx, params.VendorID, params.VendorCatID, params.Keyword, params.Page, params.PageSize, params.SortType, params.ListID) + retVal, err = cms.GetVendorMatters(params.Ctx, params.VendorID, params.VendorCatID, params.Keyword, params.Offset, params.PageSize, params.SortType, params.ListID) return retVal, "", err }) } @@ -645,3 +645,21 @@ func (c *JobController) GetVendorMatterDetail() { return retVal, "", err }) } + +// @Title 查询平台物料推荐 +// @Description 查询平台物料推荐 +// @Param token header string true "认证token" +// @Param vendorID query int true "平台ID" +// @Param goodsID query string true "平台商品ID" +// @Param rcmmdType query int true "推荐类型,1为今日销量榜,3为相似商品,5为实时热销榜" +// @Param offset query int false "页码" +// @Param pageSize query int false "页大小" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetVendorMatterRcmmd [get] +func (c *JobController) GetVendorMatterRcmmd() { + c.callGetVendorMatterRcmmd(func(params *tJobGetVendorMatterRcmmdParams) (retVal interface{}, errCode string, err error) { + retVal, err = cms.GetVendorMatterRcmmd(params.Ctx, params.VendorID, params.GoodsID, params.RcmmdType, params.Offset, params.PageSize) + return retVal, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 5557149e5..796305e62 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -646,6 +646,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"], + beego.ControllerComments{ + Method: "GetVendorMatterRcmmd", + Router: "/GetVendorMatterRcmmd", + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:JobController"], beego.ControllerComments{ Method: "SubmitJob",