Browse Source

Merge branch 'feature/v1.2.11_ws' of SocialPlatform/messageCenter into feature/v1.2.11

wangshan 11 months ago
parent
commit
203360e4a0

+ 2 - 5
.idea/workspace.xml

@@ -6,13 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="8ae7f6f2-adc5-4a6a-b6f0-2ff3221f7b1f" name="变更" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/handler/messageaddhandler.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/handler/messageaddhandler.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/findmessagelogic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/messageaddlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/messageaddlogic.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/messagecountlogic.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/handler/createchatsessionhandler.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/handler/createchatsessionhandler.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/logic/createchatsessionlogic.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/logic/createchatsessionlogic.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/messagecenter/internal/types/types.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/internal/types/types.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/api/messagecenter/messagecenter.api" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/messagecenter.api" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/messagecenter/util/util.go" beforeDir="false" afterPath="$PROJECT_DIR$/api/messagecenter/util/util.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 1
api/messagecenter/internal/handler/createchatsessionhandler.go

@@ -17,7 +17,7 @@ func createChatSessionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 			return
 		}
 
-		l := logic.NewCreateChatSessionLogic(r.Context(), svcCtx)
+		l := logic.NewCreateChatSessionLogic(r.Context(), svcCtx, r)
 		resp, err := l.CreateChatSession(&req)
 		if err != nil {
 			httpx.Error(w, err)

+ 12 - 1
api/messagecenter/internal/logic/createchatsessionlogic.go

@@ -5,27 +5,38 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/types"
+	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/util"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
+	"net/http"
 )
 
 type CreateChatSessionLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
+	r      *http.Request
 }
 
-func NewCreateChatSessionLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateChatSessionLogic {
+func NewCreateChatSessionLogic(ctx context.Context, svcCtx *svc.ServiceContext, r *http.Request) *CreateChatSessionLogic {
 	return &CreateChatSessionLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
+		r:      r,
 	}
 }
 
 func (l *CreateChatSessionLogic) CreateChatSession(req *types.ChatSessionReq) (*types.CommonRes, error) {
+	if req.NewUserId == 0 {
+		r, err := util.GetTouristInfo(l.r, l.svcCtx.Social, l.ctx)
+		if err != nil || r.BaseUserId == 0 {
+			return nil, err
+		}
+		req.NewUserId = r.BaseUserId
+	}
 	chatMession := &messagecenter.ChatSessionReq{}
 	if req.UserType == 1 {
 		//客服信息

+ 1 - 1
api/messagecenter/internal/types/types.go

@@ -78,7 +78,7 @@ type ChatSessionReq struct {
 	AppId               string `header:"appId"`
 	ReceiveEntId        string `json:"receiveEntId,optional"`
 	EntUserId           int64  `header:"entUserId,optional"`
-	NewUserId           int64  `header:"newUserId"`
+	NewUserId           int64  `header:"newUserId,optional"`
 	ReceiveAppId        string `json:"receiveAppId,optional"`
 	ReceiveId           string `json:"receiveId,optional"`
 	CustomerserviceName string `json:"customerserviceName,optional"`

+ 1 - 1
api/messagecenter/messagecenter.api

@@ -72,7 +72,7 @@ type ChatSessionReq {
 	AppId               string `header:"appId"`
 	ReceiveEntId        string `json:"receiveEntId,optional"`
 	EntUserId           int64  `header:"entUserId,optional"`
-	NewUserId           int64  `header:"newUserId"`
+	NewUserId           int64  `header:"newUserId,optional"`
 	ReceiveAppId        string `json:"receiveAppId,optional"`
 	ReceiveId           string `json:"receiveId,optional"`
 	CustomerserviceName string `json:"customerserviceName,optional"`