Merge remote-tracking branch 'origin/master'

api/wx/v1/wx.go

@@ -4,7 +4,7 @@ import "github.com/gogf/gf/v2/frame/g"
 
 type WeChatLoginReq struct {
 	g.Meta  `path:"/wechat/login" method:"post" tags:"WeChat" summary:"(PC)获取微信二维码登录"`
-	SceneId string `json:"sceneId" v:"required" dc:"场景ID,规则：[门店code]_[6位随机字符串]"`
+	SceneId string `json:"sceneId" v:"required" dc:"场景ID"`
 }
 type WeChatLoginRes struct {
 }
@@ -42,3 +42,12 @@ type WeChatPollingRes struct {
 	Status string `json:"status" dc:"状态"`
 	Token  string `json:"token" dc:"token"`
 }
+
+type GetWechatSceneIdReq struct {
+	g.Meta        `path:"/wechat/sceneId" method:"get" tags:"WeChat" summary:"(PC)获取微信场景ID"`
+	NetbarAccount string `json:"netbarAccount" v:"required" dc:"网关账号"`
+}
+
+type GetWechatSceneIdRes struct {
+	SceneId string `json:"sceneId" v:"required" dc:"场景ID"`
+}

api/wx/wx.go

@@ -15,4 +15,5 @@ type IWxV1 interface {
 	WeChatEvent(ctx context.Context, req *v1.WeChatEventReq) (res *v1.WeChatEventRes, err error)
 	WeChatVertify(ctx context.Context, req *v1.WeChatVertifyReq) (res *v1.WeChatVertifyRes, err error)
 	WeChatPolling(ctx context.Context, req *v1.WeChatPollingReq) (res *v1.WeChatPollingRes, err error)
+	GetWechatSceneId(ctx context.Context, req *v1.GetWechatSceneIdReq) (res *v1.GetWechatSceneIdRes, err error)
 }

internal/controller/wx/wx_v1_get_wechat_scene_id.go

@@ -0,0 +1,12 @@
+package wx
+
+import (
+	"context"
+	"fmt"
+	"server/api/wx/v1"
+	"time"
+)
+
+func (c *ControllerV1) GetWechatSceneId(ctx context.Context, req *v1.GetWechatSceneIdReq) (res *v1.GetWechatSceneIdRes, err error) {
+	return &v1.GetWechatSceneIdRes{SceneId: fmt.Sprintf("%s_%d", req.NetbarAccount, time.Now().Unix())}, nil
+}