Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/info/internal/handler/restaurantlisthandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/info/internal/logic"
+	"fusenapi/server/info/internal/svc"
+	"fusenapi/server/info/internal/types"
+)
+
+func RestaurantListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.Request
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewRestaurantListLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.RestaurantList(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/info/internal/handler/routes.go

@@ -57,6 +57,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/info/address/list",
 				Handler: AddressListHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/api/info/restaurant/list",
+				Handler: RestaurantListHandler(serverCtx),
+			},
 		},
 	)
 }

server/info/internal/logic/restaurantlistlogic.go

@@ -0,0 +1,71 @@
+package logic
+
+import (
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/info/internal/svc"
+	"fusenapi/server/info/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type RestaurantListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewRestaurantListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *RestaurantListLogic {
+	return &RestaurantListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *RestaurantListLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *RestaurantListLogic) RestaurantList(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) {
+	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
+	// userinfo 传入值时, 一定不为null
+
+	values := []string{
+		"Pizza Shop",
+		"Coffee Shop",
+		"Salad Shop",
+		"Other Non-Asian Restaurants",
+		"Fried Chicken / Burger / Sandwich Restaurant",
+		"Other Restaurants",
+		"Bakery / Dessert Shop",
+		"Ramen /Vietnamese / Thai / Korean / Chinese",
+		"Breakfast & Brunch",
+		"Moxican",
+		"Pho",
+		"Ramen",
+		"Chinese",
+		"Burgers",
+		"Sushi Restaurant",
+		"Indian",
+		"Vegan",
+		"Smoothie",
+		"Healthy",
+		"Soup",
+		"Italian",
+		"Boba Tea Shop",
+		"Other",
+		"Korean / Thai",
+		"Bar",
+	}
+
+	return resp.SetStatus(basic.CodeOK, values)
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *RestaurantListLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server_api/info.api

@@ -36,6 +36,9 @@ service info {
 	
 	@handler AddressListHandler
 	get /api/info/address/list(request) returns (response);
+	
+	@handler RestaurantListHandler
+	get /api/info/restaurant/list(request) returns (response);
 }
 
 type (