Revert "feat:p707 未登录广告位调整"

This reverts commit 97f217032853d1b2bca6f4ed68388dc644f252bb.

src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.32.8
+	app.yhyue.com/moapp/jypkg v1.31.8
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0

src/jfw/front/dataExport.go

@@ -721,7 +721,7 @@ func (d *DataExport) ToCreateOrderPage(_id string) error {
 
 	if resEmail == "" || resPhone == "" {
 		lastEmail, lastPhone := "", ""
-		if lastPhone, lastEmail = dataexport.GetLastExportPhoneAndMail(public.Mysql, userId); lastPhone == "" || lastEmail == "" {
+		if lastPhone, lastEmail = dataexport.GetLastExportPhoneAndMail(public.Mysql, userId, util.ObjToString(sessVal["entUserId"])); lastPhone == "" || lastEmail == "" {
 			userData := jyutil.Compatible.Select(userId, `{"s_myemail":1,"s_phone":1,"s_m_phone":1}`)
 			if userData != nil && len(*userData) > 0 {
 				if lastEmail == "" {

src/jfw/front/ws_dataExport.go

@@ -320,7 +320,7 @@ func (w *WsDataExport) SubmitOrder() error {
 
 	if resEmail == "" || resPhone == "" {
 		lastEmail, lastPhone := "", ""
-		if lastPhone, lastEmail = dataexport.GetLastExportPhoneAndMail(public.Mysql, userId); lastPhone == "" || lastEmail == "" {
+		if lastPhone, lastEmail = dataexport.GetLastExportPhoneAndMail(public.Mysql, userId, util.ObjToString(w.GetSession("entUserId"))); lastPhone == "" || lastEmail == "" {
 			userData := jyutil.Compatible.Select(userId, `{"s_myemail":1,"s_phone":1,"s_m_phone":1}`)
 			if userData != nil && len(*userData) > 0 {
 				if lastEmail == "" {

src/jfw/tag/a_init.go

@@ -11,7 +11,6 @@ var mongodb = public.MQFW
 func init() {
 	xweb.RootApp().AddTmplVar("Msg", Msg)
 	xweb.RootApp().AddTmplVar("Ad", Ad)
-	xweb.RootApp().AddTmplVar("AdDetail", AdDetail)
 	xweb.RootApp().AddTmplVar("JyCms", jyutil.GetFirstJyCms)
 	xweb.RootApp().AddTmplVar("JyTopMenu", TopMenu)
 	xweb.RootApp().AddTmplVar("JyBottomLink", BottomLink)

src/jfw/tag/ad.go

@@ -99,57 +99,3 @@ func Ad(sCode string, n int, host, sessionId string) []jy.AdInfo {
 	}
 	return ads
 }
-func AdDetail(sCode string, n int, host, sessionId string, subtype string) []jy.AdInfo {
-	defer util.Catch()
-	log.Println("sessionId:", sessionId)
-	var (
-		isLogin  bool
-		baseInfo *jy.BigVipBaseMsg
-	)
-	if sessionId != "" {
-		sessionId, _ = url.QueryUnescape(sessionId)
-		//adSessionLock.Lock()
-		jyS := &jySession{}
-		//jyS := adSessionMap[sessionId]
-		//adSessionLock.Unlock()
-		if jyS == nil || jyS.UserId == "" {
-			rVal, err := redis.GetBytes("session", sessionId)
-			if err == nil {
-				if err = json.Unmarshal(*rVal, &jyS); err != nil {
-					log.Println("ad session err:", err.Error())
-				}
-			}
-		}
-		if jyS != nil && jyS.UserId != "" {
-			baseInfo = jy.GetBigVipUserBaseMsgBySessVal(map[string]interface{}{
-				"base_user_id": jyS.BaseUserId,
-				"entId":        jyS.EntId,
-				"positionType": jyS.PositionType,
-				"accountId":    jyS.AccountId,
-				"positionId":   jyS.PositionId,
-				"userId":       jyS.UserId,
-				"mgoUserId":    jyS.MgoUserId,
-			}, *config.Middleground)
-			if baseInfo != nil && baseInfo.Uid != "" {
-				isLogin = true
-			}
-		}
-	}
-	adf := jy.AdFunc{
-		AdCodes:   []string{sCode},
-		UserInfo:  baseInfo,
-		Mgo:       &public.MQFW,
-		MySql:     public.Mysql,
-		Host:      host,
-		Ads:       nil,
-		OrderCode: "",
-		IsLogin:   isLogin,
-		SessionId: sessionId,
-		Subtype:   subtype,
-	}
-	ads := adf.GetAdInfos()[sCode]
-	if n > 0 {
-		return ads[:n]
-	}
-	return ads
-}

src/web/templates/pc/tags/detail.html

@@ -89,12 +89,7 @@
               </div>
             </div>
           </div>
-          {{$ad_1:=(AdDetail "pc-nologin-detail-middle" -1 .Host (cookie "SESSIONID")  "default" )}}
-          {{if eq .T.obj.subtype "拟建" }}
-               {{$ad_1 =(AdDetail "pc-nologin-detail-middle" -1 .Host (cookie "SESSIONID")  .T.obj.subtype )}}
-          {{else if eq .T.obj.subtype "采购意向" }}
-               {{$ad_1 =(AdDetail "pc-nologin-detail-middle" -1 .Host (cookie "SESSIONID")  .T.obj.subtype )}}
-          {{end}}
+          {{$ad_1:=(Ad "pc-nologin-detail-middle" -1 .Host (cookie "SESSIONID"))}}
           {{if $ad_1}}
           <div class="bid-banner">
             {{range $ad := $ad_1}}