Merge branch 'yhg_250102' into debug

desc/wechat/whatsapp.api

@@ -95,6 +95,28 @@ type (
         // Whatsapp information | Whatsapp数据
         Data WhatsappInfo `json:"data"`
     }
+
+	ConversationalAutomationReq {
+		WaId  *string `json:"waId,optional"`
+		Cc *string `json:"cc,optional"`
+		Phone  *string `json:"phone,optional"`
+	}
+	ConversationalAutomationResp {
+		BaseDataInfo
+
+		// Whatsapp list data | Whatsapp列表数据
+		Data ConversationalAutomationInfo `json:"data"`
+	}
+	ConversationalAutomationInfo {
+		Prompts []string `json:"prompts,optional"`
+		Commands []Command `json:"commands,optional"`
+		PhoneNumber string `json:"phoneNumber,optional"`
+		EnableWelcomeMessage bool `json:"enableWelcomeMessage,optional"`
+	}
+	Command {
+		CommandDescription string `json:"commandDescription,optional"`
+		CommandName string `json:"commandName,optional"`
+	}
 )
 
 @server(
@@ -123,4 +145,8 @@ service Wechat {
     // Get whatsapp by ID | 通过ID获取Whatsapp
     @handler getWhatsappById
     post /whatsapp (IDReq) returns (WhatsappInfoResp)
+
+	// Get whatsapp by ID | 通过ID获取Whatsapp
+	@handler GetConversationalAutomation
+	post /whatsapp/GetConversationalAutomation (ConversationalAutomationReq) returns (ConversationalAutomationResp)
 }

hook/aliyun/whatsapp.go

@@ -52,6 +52,26 @@ func GetCamsAppId() (string, error) {
 	return *isvResponse.Body.AppId, nil
 }
 
+// GetConversationalAutomation 获取号码欢迎消息、开场白和命令
+func GetConversationalAutomation(custSpaceId, phone string) (*cams20200606.GetConversationalAutomationResponse, error) {
+	client, _err := CreateCamsClient()
+	if _err != nil {
+		return nil, _err
+	}
+
+	request := &cams20200606.GetConversationalAutomationRequest{
+		CustSpaceId: tea.String(custSpaceId),
+		PhoneNumber: tea.String(phone),
+	}
+
+	response, _err := client.GetConversationalAutomation(request)
+	if _err != nil {
+		return nil, _err
+	}
+
+	return response, nil
+}
+
 // AddCamsPhoneNumber 添加WhatsApp号码
 func AddCamsPhoneNumber(phone, cc, custSpaceId, verifiedName string) (*cams20200606.AddChatappPhoneNumberResponse, error) {
 	client, _err := CreateCamsClient()

internal/handler/routes.go

@@ -1804,6 +1804,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 					Path:    "/whatsapp",
 					Handler: whatsapp.GetWhatsappByIdHandler(serverCtx),
 				},
+				{
+					Method:  http.MethodPost,
+					Path:    "/whatsapp/GetConversationalAutomation",
+					Handler: whatsapp.GetConversationalAutomationHandler(serverCtx),
+				},
 			}...,
 		),
 		rest.WithJwt(serverCtx.Config.Auth.AccessSecret),

internal/handler/whatsapp/get_conversational_automation_handler.go

@@ -0,0 +1,44 @@
+package whatsapp
+
+import (
+	"net/http"
+
+	"github.com/zeromicro/go-zero/rest/httpx"
+
+	"wechat-api/internal/logic/whatsapp"
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+)
+
+// swagger:route post /whatsapp/GetConversationalAutomation whatsapp GetConversationalAutomation
+//
+// Get whatsapp by ID | 通过ID获取Whatsapp
+//
+// Get whatsapp by ID | 通过ID获取Whatsapp
+//
+// Parameters:
+//  + name: body
+//    require: true
+//    in: body
+//    type: ConversationalAutomationReq
+//
+// Responses:
+//  200: WhatsappInfoResp
+
+func GetConversationalAutomationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var req types.ConversationalAutomationReq
+		if err := httpx.Parse(r, &req, true); err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+			return
+		}
+
+		l := whatsapp.NewGetConversationalAutomationLogic(r.Context(), svcCtx)
+		resp, err := l.GetConversationalAutomation(&req)
+		if err != nil {
+			httpx.ErrorCtx(r.Context(), w, err)
+		} else {
+			httpx.OkJsonCtx(r.Context(), w, resp)
+		}
+	}
+}

internal/logic/whatsapp/get_conversational_automation_logic.go

@@ -0,0 +1,37 @@
+package whatsapp
+
+import (
+	"context"
+	"wechat-api/hook/aliyun"
+
+	"wechat-api/internal/svc"
+	"wechat-api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetConversationalAutomationLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetConversationalAutomationLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetConversationalAutomationLogic {
+	return &GetConversationalAutomationLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx}
+}
+
+func (l *GetConversationalAutomationLogic) GetConversationalAutomation(req *types.ConversationalAutomationReq) (*types.ConversationalAutomationResp, error) {
+	phone := *req.Cc + *req.Phone
+	response, err := aliyun.GetConversationalAutomation(*req.WaId, phone)
+
+	resp := types.ConversationalAutomationResp{}
+	if err == nil && *response.Body.Code == "OK" {
+		//resp.Data.Commands = response.Body.Data.Commands
+
+	}
+
+	return &resp, nil
+}

internal/logic/whatsapp_channel/create_whatsapp_channel_logic.go

@@ -27,7 +27,6 @@ func NewCreateWhatsappChannelLogic(ctx context.Context, svcCtx *svc.ServiceConte
 }
 
 func (l *CreateWhatsappChannelLogic) CreateWhatsappChannel(req *types.WhatsappChannelInfo) (*types.BaseMsgResp, error) {
-	organizationId := l.ctx.Value("organizationId").(uint64)
 	_, err := l.svcCtx.DB.WhatsappChannel.Create().
 		//SetNotNilStatus(req.Status).
 		SetNotNilAk(req.Ak).
@@ -36,7 +35,7 @@ func (l *CreateWhatsappChannelLogic) CreateWhatsappChannel(req *types.WhatsappCh
 		SetNotNilWaName(req.WaName).
 		SetNotNilWabaID(req.WabaId).
 		SetNotNilBusinessID(req.BusinessId).
-		SetNotNilOrganizationID(&organizationId).
+		SetNotNilOrganizationID(req.OrganizationId).
 		SetNotNilVerifyAccount(req.VerifyAccount).
 		Save(l.ctx)
 

internal/logic/whatsapp_channel/update_whatsapp_channel_logic.go

@@ -34,7 +34,7 @@ func (l *UpdateWhatsappChannelLogic) UpdateWhatsappChannel(req *types.WhatsappCh
 		SetNotNilWaName(req.WaName).
 		SetNotNilWabaID(req.WabaId).
 		SetNotNilBusinessID(req.BusinessId).
-		//SetNotNilOrganizationID(req.OrganizationId).
+		SetNotNilOrganizationID(req.OrganizationId).
 		SetNotNilVerifyAccount(req.VerifyAccount).
 		Exec(l.ctx)
 

internal/types/types.go

@@ -3485,6 +3485,33 @@ type WhatsappInfoResp struct {
 	Data WhatsappInfo `json:"data"`
 }
 
+// swagger:model ConversationalAutomationReq
+type ConversationalAutomationReq struct {
+	WaId  *string `json:"waId,optional"`
+	Cc    *string `json:"cc,optional"`
+	Phone *string `json:"phone,optional"`
+}
+
+// swagger:model ConversationalAutomationResp
+type ConversationalAutomationResp struct {
+	BaseDataInfo
+	// Whatsapp list data | Whatsapp列表数据
+	Data ConversationalAutomationInfo `json:"data"`
+}
+
+// swagger:model ConversationalAutomationInfo
+type ConversationalAutomationInfo struct {
+	Prompts              []string  `json:"prompts,optional"`
+	Commands             []Command `json:"commands,optional"`
+	PhoneNumber          string    `json:"phoneNumber,optional"`
+	EnableWelcomeMessage bool      `json:"enableWelcomeMessage,optional"`
+}
+
+type Command struct {
+	CommandDescription string `json:"commandDescription,optional"`
+	CommandName        string `json:"commandName,optional"`
+}
+
 // The data of whatsapp channel information | WhatsappChannel信息
 // swagger:model WhatsappChannelInfo
 type WhatsappChannelInfo struct {