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

server/home-user-auth/internal/handler/routes.go

@@ -75,7 +75,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/user/order-list",
-				Handler: GetUserOrderListHandler(serverCtx),
+				Handler: UserOrderListHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodGet,

server/home-user-auth/internal/handler/userorderlisthandler.go

@@ -4,20 +4,19 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/zeromicro/go-zero/core/logx"
-	"github.com/zeromicro/go-zero/rest/httpx"
-
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 
 	"fusenapi/server/home-user-auth/internal/logic"
 	"fusenapi/server/home-user-auth/internal/svc"
 	"fusenapi/server/home-user-auth/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
-func GetUserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func UserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-
 		var (
 			// 定义错误变量
 			err error
@@ -53,7 +52,7 @@ func GetUserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			userinfo = &auth.UserInfo{UserId: 0, GuestId: 0}
 		}
 
-		var req types.GetUserOrderListReq
+		var req types.UserOrderListReq
 		// 如果端点有请求结构体，则使用httpx.Parse方法从HTTP请求体中解析请求数据
 		if err := httpx.Parse(r, &req); err != nil {
 			httpx.OkJsonCtx(r.Context(), w, &basic.Response{
@@ -64,8 +63,8 @@ func GetUserOrderListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 		// 创建一个业务逻辑层实例
-		l := logic.NewGetUserOrderListLogic(r.Context(), svcCtx)
-		resp := l.GetUserOrderList(&req, userinfo)
+		l := logic.NewUserOrderListLogic(r.Context(), svcCtx)
+		resp := l.UserOrderList(&req, userinfo)
 		// 如果响应不为nil，则使用httpx.OkJsonCtx方法返回JSON响应;
 		if resp != nil {
 			httpx.OkJsonCtx(r.Context(), w, resp)

server/home-user-auth/internal/logic/userorderlistlogic.go

@@ -18,21 +18,21 @@ import (
 	"gorm.io/gorm"
 )
 
-type GetUserOrderListLogic struct {
+type UserOrderListLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewGetUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetUserOrderListLogic {
-	return &GetUserOrderListLogic{
+func NewUserOrderListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserOrderListLogic {
+	return &UserOrderListLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
-func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+func (l *UserOrderListLogic) UserOrderList(req *types.UserOrderListReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
 	// userinfo 传入值时, 一定不为null
 
@@ -136,7 +136,7 @@ func (l *GetUserOrderListLogic) GetUserOrderList(req *types.GetUserOrderListReq,
 
 	}
 
-	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetUserOrderListRsp{
+	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.UserOrderListRsp{
 		Items: respList,
 		Meta: types.Meta{
 			TotalCount:  total,

server/home-user-auth/internal/types/types.go

@@ -14,7 +14,7 @@ type UserOrderCancelReq struct {
 type UserOrderCancelRsp struct {
 }
 
-type GetUserOrderListReq struct {
+type UserOrderListReq struct {
 	Page     int64 `form:"page"`      // 分页
 	PageSize int64 `form:"page_size"` // 每页数量
 	Status   int64 `form:"status"`    // 状态筛选
@@ -23,7 +23,7 @@ type GetUserOrderListReq struct {
 	Size     int64 `form:"size"`      // 图片尺寸
 }
 
-type GetUserOrderListRsp struct {
+type UserOrderListRsp struct {
 	Items []Items `json:"items"`
 	Meta  Meta    `json:"_meta"`
 }

server_api/home-user-auth.api

@@ -52,11 +52,11 @@ service home-user-auth {
 	
 	@handler UserGoogleLoginHandler
 	get /api/user/oauth2/login/google(RequestGoogleLogin) returns (response);
-	
-	//获取订单列表
-	@handler GetUserOrderListHandler
-	get /api/user/order-list (GetUserOrderListReq) returns (response);
-	
+
+	//订单列表
+	@handler UserOrderListHandler
+	get /api/user/order-list (UserOrderListReq) returns (response);
+
 	//取消订单
 	@handler UserOrderCancelHandler
 	get /api/user/order-cancel (UserOrderCancelReq) returns (response);
@@ -76,7 +76,7 @@ type (
 
 // 获取订单列表
 type (
-	GetUserOrderListReq {
+	UserOrderListReq {
 		Page     int64 `form:"page"`      // 分页
 		PageSize int64 `form:"page_size"` // 每页数量
 		Status   int64 `form:"status"`    // 状态筛选
@@ -85,7 +85,7 @@ type (
 		Size     int64 `form:"size"`      // 图片尺寸
 	}
 
-	GetUserOrderListRsp {
+	UserOrderListRsp {
 		Items []Items `json:"items"`
 		Meta  Meta    `json:"_meta"`
 	}

server_api/product.api

@@ -34,9 +34,6 @@ service product {
 	//其他产品推荐列表
 	@handler OtherProductListHandler
 	get /api/product/other-list (OtherProductListReq) returns (response);
-	//获取详情页推荐产品列表
-	@handler GetRecommandProductListHandler
-	get /api/product/recommand (GetRecommandProductListReq) returns (response);
 	//获取分类产品列表
 	@handler GetTagProductListHandler
 	get /api/product/tag_product_list(GetTagProductListReq) returns (response);
@@ -68,6 +65,9 @@ service product {
 	//获取产品千人千面设计方案
 	@handler GetLastProductDesignHandler
 	get /api/product/get_last_product_design(request) returns (response);
+	//获取详情页推荐产品列表
+	@handler GetRecommandProductListHandler
+	get /api/product/recommand (GetRecommandProductListReq) returns (response);
 	//*********************产品详情分解接口结束***********************
 	//*********************推荐产品接口开始××××××××××××××××××××××××××