wangshan 2 жил өмнө
parent
commit
9a59abdd84

+ 8 - 6
jyBXBase/rpc/internal/logic/newestbiddinglogic.go

@@ -8,6 +8,7 @@ import (
 	"jyBXBase/rpc/model"
 	"log"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -44,6 +45,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				List: []*bxbase.NewestList{},
 			},
 		}
+		entUserId, _ := strconv.ParseInt(in.EntUserId, 10, 64)
 		//主体处理(fType:普通用户;vType:超级订阅用户;mType:大会员用户;eType:商机管理用户)
 		if in.PositionType == 1 {
 			//主体等于企业的
@@ -51,7 +53,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 		}
 		rks := ""
 		if userType == "e" {
-			rks = MC.If(in.UserId != "", MC.InterfaceToStr(in.EntUserId), in.City).(string)
+			rks = MC.If(in.UserId != "", in.EntUserId, in.City).(string)
 		} else {
 			rks = MC.If(in.UserId != "", in.UserId, in.City).(string)
 		}
@@ -93,7 +95,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				//大会员推送历史
 				result := []*bxbase.NewestList{}
 				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", MC.Int64All(in.EntUserId)).GetPushHistory()
+					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
 				} else {
 					result = model.GetNewestInfo(rks, "m", in.NewUserId).GetPushHistory()
 				}
@@ -115,7 +117,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 						// 已分发权限
 						if MC.IntAll(entNicheInfo["power"]) > 0 {
 							//商机管理推送历史
-							result := model.GetNewestInfo(in.EntUserId, "e", MC.Int64All(in.EntUserId)).GetPushHistory()
+							result := model.GetNewestInfo(in.EntUserId, "e", entUserId).GetPushHistory()
 							res.Data.Count = int64(len(result))
 							if res.Data.Count > 0 {
 								res.Data.List = result
@@ -132,7 +134,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				//vip查询推送历史
 				result := []*bxbase.NewestList{}
 				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", MC.Int64All(in.EntUserId)).GetPushHistory()
+					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
 				} else {
 					result = model.GetNewestInfo(rks, "v", in.NewUserId).GetPushHistory()
 				}
@@ -151,7 +153,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				//普通用户查询推送历史
 				result := []*bxbase.NewestList{}
 				if userType == "e" {
-					result = model.GetNewestInfo(rks, "e", MC.Int64All(in.EntUserId)).GetPushHistory()
+					result = model.GetNewestInfo(rks, "e", entUserId).GetPushHistory()
 				} else {
 					result = model.GetNewestInfo(rks, "f", in.NewUserId).GetPushHistory()
 				}
@@ -200,7 +202,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 		if i == 0 {
 			rks := ""
 			if userType == "e" {
-				rks = MC.If(in.UserId != "", MC.InterfaceToStr(in.EntUserId), in.City).(string)
+				rks = MC.If(in.UserId != "", in.EntUserId, in.City).(string)
 			} else {
 				rks = MC.If(in.UserId != "", in.UserId, in.City).(string)
 			}