Jianghan 1 年之前
父節點
當前提交
6b12807ba1
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 2 1
      api/internal/logic/createcluelogic.go
  2. 2 1
      api/internal/logic/transfercluesucclogic.go
  3. 4 6
      service/clueByPhone.go

+ 2 - 1
api/internal/logic/createcluelogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/biservice"
 	"context"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/types"
@@ -34,5 +35,5 @@ func (l *CreateClueLogic) CreateClue(req *types.CreateClueReq) (resp *types.BiRe
 		UserId:     req.UserId,
 		Phone:      req.Phone,
 	})
-	return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg, Data: res.Data}, err
+	return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg, Data: gconv.Map(gconv.UnsafeBytesToStr(res.Data))}, err
 }

+ 2 - 1
api/internal/logic/transfercluesucclogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/biservice"
 	"context"
+	"github.com/gogf/gf/v2/util/gconv"
 
 	"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/svc"
 	"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/types"
@@ -34,5 +35,5 @@ func (l *TransferClueSuccLogic) TransferClueSucc(req *types.TransferClueReq) (re
 		Phone:      req.Phone,
 		OrderNo:    req.OrderNo,
 	})
-	return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg, Data: res.Data}, err
+	return &types.BiResp{Error_code: res.ErrorCode, Error_msg: res.ErrorMsg, Data: gconv.Map(gconv.UnsafeBytesToStr(res.Data))}, err
 }

+ 4 - 6
service/clueByPhone.go

@@ -6,6 +6,7 @@ import (
 	"bp.jydev.jianyu360.cn/BaseService/biService/rpc/pb"
 	"database/sql"
 	"encoding/json"
+	"github.com/gogf/gf/v2/util/gconv"
 	"go.mongodb.org/mongo-driver/bson"
 	"time"
 )
@@ -69,11 +70,10 @@ func CreateClue(in *pb.CreateCuleReq) (result *pb.BiReply, err error) {
 		})
 		return clueId > -1 && uodateId1 > -1 && uodateId2 > -1
 	}) {
-		infoByte, _ := json.Marshal(bson.M{"id": clueId})
 		return &pb.BiReply{
 			ErrorCode: 0,
 			ErrorMsg:  "线索创建成功",
-			Data:      infoByte,
+			Data:      gconv.Bytes(bson.M{"id": clueId}),
 		}, nil
 	} else {
 		return &pb.BiReply{
@@ -208,18 +208,16 @@ func TransferClue(in *pb.TransferClueReq) (result *pb.BiReply, err error) {
 				})
 				return cId > -1 && ok && updateId1 > -1 && updateId2 > -1 && updateId3 > -1
 			}) {
-				infoByte, _ := json.Marshal(bson.M{"id": clueId})
 				return &pb.BiReply{
 					ErrorCode: 0,
 					ErrorMsg:  "线索移交成功",
-					Data:      infoByte,
+					Data:      gconv.Bytes(bson.M{"id": clueId}),
 				}, nil
 			} else {
-				infoByte, _ := json.Marshal(bson.M{"id": clueId})
 				return &pb.BiReply{
 					ErrorCode: 0,
 					ErrorMsg:  "线索移交成功",
-					Data:      infoByte,
+					Data:      gconv.Bytes(bson.M{"id": clueId}),
 				}, nil
 			}
 		}