diff --git a/business/model/user.go b/business/model/user.go index ef7dc20a5..30c2e1971 100644 --- a/business/model/user.go +++ b/business/model/user.go @@ -283,7 +283,6 @@ type UserUnionBind struct { UserID string `orm:"column(user_id)" json:"userID"` //用户ID VendorID int `orm:"column(vendor_id)" json:"vendorID"` //平台ID UnionID string `orm:"column(union_id)" json:"unionID"` //推广位ID,美团为userID,淘宝暂时是固定的京西推广位ID,pdd为此推广位ID - UnionImg string `json:"unionImg"` //该用户对应平台的处理后的小程序二维码图,目前就美团用,避免二次上传 } func (v *UserUnionBind) TableUnique() [][]string { @@ -291,3 +290,16 @@ func (v *UserUnionBind) TableUnique() [][]string { []string{"UserID", "VendorID", "UnionID"}, } } + +type UserUnionBindImg struct { + ModelIDCULD + + UnionID string `orm:"column(union_id)" json:"unionID"` //推广位ID,美团为userID,淘宝暂时是固定的京西推广位ID,pdd为此推广位ID + UnionImg string `json:"unionImg"` //该用户对应平台的处理后的小程序二维码图,目前就美团用,避免二次上传 +} + +func (v *UserUnionBindImg) TableIndex() [][]string { + return [][]string{ + []string{"UnionID"}, + } +} diff --git a/controllers/union_controller.go b/controllers/union_controller.go index 54c6cd2bc..3e3572169 100644 --- a/controllers/union_controller.go +++ b/controllers/union_controller.go @@ -137,3 +137,22 @@ func (c *UnionController) GetPddBindInfo() { return retVal, "", err }) } + +// @Title 查询联盟订单 +// @Description 查询联盟订单 +// @Param token header string true "认证token" +// @Param vendorIDs query string false "平台IDs" +// @Param statuss query string false "订单状态s" +// @Param beginTime query string false "开始时间" +// @Param endTime query string false "结束时间" +// @Param keyword query string false "关键字" +// @Param offset query int false "页码" +// @Param pageSize query int false "页大小" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetUnionOrders [get] +func (c *UnionController) GetUnionOrders() { + c.callGetUnionOrders(func(params *tUnionGetUnionOrdersParams) (retVal interface{}, errCode string, err error) { + return retVal, "", err + }) +} diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 9f21da47f..165f00f72 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -18,7 +18,8 @@ func Init() { orm.RegisterModel(&model.UserDeliveryAddress{}) orm.RegisterModel(&model.UserCityManager{}) orm.RegisterModel(&model.UserSearch{}) - orm.RegisterModel(&model.UserUnionBind{}) //联盟相关绑定 + orm.RegisterModel(&model.UserUnionBind{}) //联盟相关绑定 + orm.RegisterModel(&model.UserUnionBindImg{}) //多个活动图片 //账单 orm.RegisterModel(&model.UserBill{}, &model.BillIncome{}, &model.BillExpend{}) //支付订单 diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index b0521b417..10e0d9496 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -664,6 +664,15 @@ func init() { Filters: nil, Params: nil}) + beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:UnionController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:UnionController"], + beego.ControllerComments{ + Method: "GetUnionOrders", + Router: "/GetUnionOrders", + 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",