Merge branch 'dev/v4.8.23.2_wh' of qmx/jy into hotfix/v4.8.23.2

src/jfw/modules/publicapply/src/transfer/transfer.go

@@ -78,7 +78,8 @@ var APPEntBuyPortrait = "/jyapp/big/page/client_portrayal?type=replace&entName=%
 var WXEntBuyPortrait = "/big/wx/page/client_portrayal?entName=%s"
 
 // 企业画像
-var PCEntPortrait = "/swordfish/page_big_pc%s/ent_ser_portrait/%s"
+var PCEntPortrait = "/swordfish/page_big_pc/ent_portrait/%s"
+var PCVipEntPortrait = "/swordfish/page_big_pc/svip/ent_ser_portrait/%s"
 var APPEntPortrait = "/jyapp/big/page/ent_portrait?eId=%s"
 var WXEntPortrait = "/weixin/frontPage/collection/sess/ent_portrait?eId=%s"
 
@@ -137,14 +138,21 @@ func UrlHandle(urlStr string, repType string, u *httpsession.Session) string {
 			newUrl = fmt.Sprintf(PCLandingPage, strings.Join(queryMap["pid"], ""))
 		}
 	}
-	if strings.Contains(urlStr, "/swordfish/page_big_pc/svip/ent_ser_portrait") || strings.Contains(urlStr, "/swordfish/page_big_pc/ent_ser_portrait") {
+	if strings.Contains(urlStr, "/swordfish/page_big_pc/svip/ent_ser_portrait") || strings.Contains(urlStr, "/swordfish/page_big_pc/ent_portrait") {
 		//pc企业画像
+		Big := jy.GetBigVipUserBaseMsg(u, *config.Middleground)
 		if repType == "app" {
 			newUrl = fmt.Sprintf(APPEntPortrait, lastPath)
 		} else if repType == "wx" {
 			newUrl = fmt.Sprintf(WXEntPortrait, lastPath)
 		} else {
-			newUrl = fmt.Sprintf(PCEntPortrait, "", lastPath)
+			if Big.Status > 0 {
+				newUrl = fmt.Sprintf(PCEntPortrait, lastPath)
+			} else if Big.VipStatus > 0 {
+				newUrl = fmt.Sprintf(PCVipEntPortrait, lastPath)
+			} else {
+				newUrl = fmt.Sprintf(PCEntPortrait, lastPath)
+			}
 		}
 	}
 	if strings.Contains(urlStr, "/jyapp/big/page/ent_portrait") {
@@ -157,11 +165,11 @@ func UrlHandle(urlStr string, repType string, u *httpsession.Session) string {
 			newUrl = fmt.Sprintf(WXEntPortrait, strings.Join(queryMap["eId"], ""))
 		} else {
 			if Big.Status > 0 {
-				newUrl = fmt.Sprintf(PCEntPortrait, "", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCEntPortrait, strings.Join(queryMap["eId"], ""))
 			} else if Big.VipStatus > 0 {
-				newUrl = fmt.Sprintf(PCEntPortrait, "/svip", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCVipEntPortrait, strings.Join(queryMap["eId"], ""))
 			} else {
-				newUrl = fmt.Sprintf(PCEntPortrait, "", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCEntPortrait, strings.Join(queryMap["eId"], ""))
 			}
 		}
 	}
@@ -174,11 +182,11 @@ func UrlHandle(urlStr string, repType string, u *httpsession.Session) string {
 			newUrl = fmt.Sprintf(WXEntPortrait, strings.Join(queryMap["eId"], ""))
 		} else {
 			if Big.Status > 0 {
-				newUrl = fmt.Sprintf(PCEntPortrait, "", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCEntPortrait, strings.Join(queryMap["eId"], ""))
 			} else if Big.VipStatus > 0 {
-				newUrl = fmt.Sprintf(PCEntPortrait, "/svip", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCVipEntPortrait, strings.Join(queryMap["eId"], ""))
 			} else {
-				newUrl = fmt.Sprintf(PCEntPortrait, "", strings.Join(queryMap["eId"], ""))
+				newUrl = fmt.Sprintf(PCEntPortrait, strings.Join(queryMap["eId"], ""))
 			}
 		}
 	}