Merge remote-tracking branch 'origin/feature/v1.1.9' into feature/v1.1.9

jyBXBase/rpc/internal/logic/newestbiddinglogic.go

@@ -1,8 +1,6 @@
 package logic
 
 import (
-	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/redis"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -13,6 +11,9 @@ import (
 	"strings"
 	"time"
 
+	MC "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/redis"
+
 	"jyBXBase/rpc/internal/svc"
 	"jyBXBase/rpc/type/bxbase"
 
@@ -73,7 +74,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				o_msgset := MC.ObjToMap((*userMap)["o_member_jy"])
 				big_items, ok := (*o_msgset)["a_items"].([]interface{})
 				//大会员推送历史
-				result := model.GetNewestInfo(rks, "m",in.NewUserId).GetPushHistory()
+				result := model.GetNewestInfo(rks, "m", in.NewUserId).GetPushHistory()
 				res.Data.Count = int64(len(result))
 				if res.Data.Count > 0 {
 					res.Data.HasSubKeys = ok && len(big_items) > 0
@@ -85,7 +86,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				if count := IC.MainMysql.CountBySql(`SELECT count(1) FROM entniche_user u LEFT JOIN entniche_info i ON u.ent_id=i.id WHERE u.phone=? and u.power=1 and i.status=1`, phone); count > 0 {
 					//商机管理推送历史
 					isPayUser = true
-					result := model.GetNewestInfo(in.EntUserId, "e",in.NewUserId).GetPushHistory()
+					result := model.GetNewestInfo(in.EntUserId, "e", MC.Int64All(in.EntUserId)).GetPushHistory()
 					res.Data.Count = int64(len(result))
 					if res.Data.Count > 0 {
 						res.Data.List = result
@@ -97,7 +98,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 				o_msgset := MC.ObjToMap((*userMap)["o_vipjy"])
 				vip_items, ok := (*o_msgset)["a_items"].([]interface{})
 				//vip查询推送历史
-				result := model.GetNewestInfo(rks, "v",in.NewUserId).GetPushHistory()
+				result := model.GetNewestInfo(rks, "v", in.NewUserId).GetPushHistory()
 				res.Data.IsVip = true
 				res.Data.HasSubKeys = ok && len(vip_items) > 0
 				res.Data.Count = int64(len(result))
@@ -113,7 +114,7 @@ func (l *NewestBiddingLogic) NewestBidding(in *bxbase.NewestBiddingReq) (*bxbase
 			items, ok := (*o_msgset)["a_key"].([]interface{})
 			if ok && len(items) > 0 {
 				//普通用户查询推送历史
-				result := model.GetNewestInfo(rks, "f",in.NewUserId).GetPushHistory()
+				result := model.GetNewestInfo(rks, "f", in.NewUserId).GetPushHistory()
 				res.Data.IsVip = false
 				res.Data.HasSubKeys = ok && len(items) > 0
 				res.Data.Count = int64(len(result))