|
@@ -3,9 +3,6 @@ package whatsapp
|
|
|
import (
|
|
|
"context"
|
|
|
"github.com/suyuan32/simple-admin-core/rpc/types/core"
|
|
|
- "github.com/zeromicro/go-zero/core/errorx"
|
|
|
- "wechat-api/hook/aliyun"
|
|
|
-
|
|
|
"wechat-api/ent/predicate"
|
|
|
"wechat-api/ent/whatsapp"
|
|
|
"wechat-api/internal/svc"
|
|
@@ -46,7 +43,15 @@ func (l *GetWhatsappListLogic) GetWhatsappList(req *types.WhatsappListReq) (*typ
|
|
|
if req.WaId != nil && *req.WaId != "" {
|
|
|
predicates = append(predicates, whatsapp.WaID(*req.WaId))
|
|
|
} else {
|
|
|
- return nil, errorx.NewInvalidArgumentError("通道ID不能为空")
|
|
|
+ //wclist, err := l.svcCtx.DB.WhatsappChannel.Query().All(l.ctx)
|
|
|
+ //if err != nil {
|
|
|
+ // return nil, errorx.NewInvalidArgumentError(err.Error())
|
|
|
+ //}
|
|
|
+ //ids := make([]string, 0)
|
|
|
+ //for _, v := range wclist {
|
|
|
+ // ids = append(ids, v.WaID)
|
|
|
+ //}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
data, err := l.svcCtx.DB.Whatsapp.Query().Where(predicates...).WithAgent().Page(l.ctx, req.Page, req.PageSize)
|
|
@@ -59,10 +64,10 @@ func (l *GetWhatsappListLogic) GetWhatsappList(req *types.WhatsappListReq) (*typ
|
|
|
resp.Msg = errormsg.Success
|
|
|
resp.Data.Total = data.PageDetails.Total
|
|
|
|
|
|
- result, err := aliyun.QueryCamsChatappPhoneNumbers(*req.WaId)
|
|
|
- l.Logger.Infof("result=%v err=%v\n", result, err)
|
|
|
+ //result, err := aliyun.QueryCamsChatappPhoneNumbers(*req.WaId)
|
|
|
+ //l.Logger.Infof("result=%v err=%v\n", result, err)
|
|
|
|
|
|
- phoneNumbers := result.Body.PhoneNumbers
|
|
|
+ //phoneNumbers := result.Body.PhoneNumbers
|
|
|
|
|
|
for _, v := range data.List {
|
|
|
organizationName := ""
|
|
@@ -92,16 +97,16 @@ func (l *GetWhatsappListLogic) GetWhatsappList(req *types.WhatsappListReq) (*typ
|
|
|
}
|
|
|
|
|
|
var phoneStatus, quality, verifyStatus, frequency string
|
|
|
- currentPhone := v.Cc + v.Phone
|
|
|
- for _, v := range phoneNumbers {
|
|
|
- if *v.PhoneNumber == currentPhone {
|
|
|
- phoneStatus = *v.Status
|
|
|
- verifyStatus = *v.CodeVerificationStatus
|
|
|
- quality = *v.QualityRating
|
|
|
- frequency = *v.MessagingLimitTier
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
+ //currentPhone := v.Cc + v.Phone
|
|
|
+ //for _, v := range phoneNumbers {
|
|
|
+ // if *v.PhoneNumber == currentPhone {
|
|
|
+ // phoneStatus = *v.Status
|
|
|
+ // verifyStatus = *v.CodeVerificationStatus
|
|
|
+ // quality = *v.QualityRating
|
|
|
+ // frequency = *v.MessagingLimitTier
|
|
|
+ // break
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
resp.Data.Data = append(resp.Data.Data,
|
|
|
types.WhatsappInfo{
|