diff --git a/app/admin/hdl/hdl_scheme.go b/app/admin/hdl/hdl_scheme.go index 0693e93..8b2b80a 100644 --- a/app/admin/hdl/hdl_scheme.go +++ b/app/admin/hdl/hdl_scheme.go @@ -44,8 +44,10 @@ func SchemeList(c *gin.Context) { return } temp.EnterpriseList = append(temp.EnterpriseList, struct { + Id int `json:"id"` Name string `json:"name"` }{ + Id: enterprise.Id, Name: enterprise.Name, }) } diff --git a/app/admin/md/md_scheme.go b/app/admin/md/md_scheme.go index 95ca63b..71d734a 100644 --- a/app/admin/md/md_scheme.go +++ b/app/admin/md/md_scheme.go @@ -7,6 +7,7 @@ import ( type SchemeListResp struct { Data model.Scheme `json:"data"` EnterpriseList []struct { + Id int `json:"id"` Name string `json:"name"` } `json:"enterprise_list"` } diff --git a/app/router/admin_router.go b/app/router/admin_router.go index a20054c..c46ee1a 100644 --- a/app/router/admin_router.go +++ b/app/router/admin_router.go @@ -124,7 +124,7 @@ func rRole(r *gin.RouterGroup) { r.POST("/bindAdminRole", hdl.BindAdminRole) //绑定角色 } func rGoodsPay(r *gin.RouterGroup) { - r.GET("/enterpriseList", hdl.EnterpriseList) //校企列表 + r.POST("/enterpriseList", hdl.EnterpriseList) //校企列表 r.GET("/goodsList", goodsHdl.GetMallGoodsList) //商品列表 r.POST("/calcAmount", orderHdl.GoodsPayCalcAmount) //商品下单计算价格 r.POST("/create", orderHdl.GoodsPayCreate) //商品下单 @@ -140,6 +140,12 @@ func rOrder(r *gin.RouterGroup) { r.POST("/editNum", orderHdl.OrderEditNum) //用户订单修改订单数 r.POST("/makeRecord", orderHdl.MarkRecord) //制作记录 } + +func rFinanceManage(r *gin.RouterGroup) { + r.POST("/list", orderHdl.OrderList) //用户订单 + r.POST("/total", orderHdl.OrderTotal) //用户订单统计 +} + func AdminRoute(r *gin.RouterGroup) { r.GET("/demo", hdl.Demo) @@ -161,9 +167,10 @@ func AdminRoute(r *gin.RouterGroup) { rCategory(r.Group("/category")) //商品类目 rGoods(r.Group("/goods")) //商品 - rRole(r.Group("/role")) //权限管理 - rSetCenter(r.Group("/setCenter")) //设置中心 - rUser(r.Group("/user")) //用户管理 - rGoodsPay(r.Group("/goodsPay")) //商品下单 - rOrder(r.Group("/order")) //用户订单 + rRole(r.Group("/role")) //权限管理 + rSetCenter(r.Group("/setCenter")) //设置中心 + rUser(r.Group("/user")) //用户管理 + rGoodsPay(r.Group("/goodsPay")) //商品下单 + rOrder(r.Group("/order")) //用户订单 + rFinanceManage(r.Group("/financeManage")) //财务管理 }