Merge branch 'feature/v4.9.93' into dev/v4.9.93_tsz

src/jfw/active/active.go

@@ -1,7 +1,10 @@
 package active
 
 import (
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 	"app.yhyue.com/moapp/jypkg/public"
+	"fmt"
 	"regexp"
 
 	util "app.yhyue.com/moapp/jybase/common"
@@ -48,9 +51,12 @@ type Active struct {
 
 }
 
-var mongodb = public.MQFW
-var se = encrypt.SimpleEncrypt{Key: "topnet2015topnet2015"}
-var mobileReg = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
+var (
+	mongodb      = public.MQFW
+	se           = encrypt.SimpleEncrypt{Key: "topnet2015topnet2015"}
+	mobileReg    = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
+	cacheTimeOut = 3 * 24 * 60 * 60 //三天
+)
 
 func init() {
 	//添加模块解析
@@ -73,6 +79,15 @@ func (a *Active) TransitRoute(key string) error {
 			if !bm { //如果电脑端 访问电脑端
 				return a.Redirect("/active/transit/day01")
 			}
+		case "day04": //PC
+			if bm { //如果是移动端 访问移动端
+				return a.Redirect("/active/transit/day06")
+			}
+		case "day06": //WX
+			if !bm { //如果电脑端 访问电脑端
+				return a.Redirect("/active/transit/day04")
+			}
+
 		}
 		shortUrls := public.Mysql.SelectBySql(`SELECT * FROM short_url WHERE mold = 1 AND code = ?`, key)
 		if shortUrls != nil && len(*shortUrls) > 0 {
@@ -86,6 +101,12 @@ func (a *Active) TransitRoute(key string) error {
 				redirectUrl = util.ObjToString(shortUrl["href"])
 			}
 		}
+		//未登录
+		if userId, _ := a.GetSession("userId").(string); userId == "" {
+			jy.SetCookieValue(a.ResponseWriter, jy.ChannelCookieName, key, cacheTimeOut)                      //三天
+			redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", a.Session().Id()), key, cacheTimeOut) //登录注册 用户标识
+			return a.Redirect(redirectUrl)
+		}
 	}
 	return a.Redirect(redirectUrl)
 }

src/jfw/modules/app/src/app/front/shorturl.go

@@ -924,6 +924,13 @@ func (s *Short) TransitRoute(key string) error {
 				redirectUrl = util.ObjToString(shortUrl["href"])
 			}
 		}
+
+		//未登录
+		if userId, _ := s.GetSession("userId").(string); userId == "" {
+			jy.SetCookieValue(s.ResponseWriter, jy.ChannelCookieName, key, cacheTimeOut)                      //三天
+			redis.Put("limitation", fmt.Sprintf("firstVisitTagByWX_%s", s.Session().Id()), key, cacheTimeOut) //登录注册 用户标识
+			return s.Redirect(redirectUrl)
+		}
 	}
 	return s.Redirect(redirectUrl)
 }

src/jfw/modules/app/src/web/templates/frontRouter/activity/free/202402.html

@@ -39,7 +39,7 @@
                 </div>
                 <div class="header-banner-content">
                     <div class="header-banner-content-time">${activeStartTime} - ${activeEndTime}</div>
-                    <div class="header-banner-machine">
+                    <div class="header-banner-machine" :style="machineStyle">
                         <div class="machine-title" v-if="pointsMold">${activityConf.cost}剑鱼币抽会员</div>
                         <div class="machine-ani-content machine-canvas" id="ballBox">
                             <div class="machine-ball-list">

src/jfw/modules/bigmember/src/entity/followEnterprise.go

@@ -166,11 +166,11 @@ func (this *EntFollow) GetEntFollowList(pNum, pSize int, match, groups string) (
 
 		var (
 			enCodeGroups []string
+			has          = true
 		)
-
 		if len(groupIds) > 0 {
+			has = false
 			var (
-				has    = false
 				groups = strings.Split(gconv.String(item["gs"]), ",")
 			)
 			for _, group := range groups {
@@ -181,9 +181,9 @@ func (this *EntFollow) GetEntFollowList(pNum, pSize int, match, groups string) (
 					}
 				}
 			}
-			if !has {
-				continue
-			}
+		}
+		if !has {
+			continue
 		}
 		entId := qutil.ObjToString(item["s_entId"])
 		if entId == "" { //dev3.6.2 前关注企业未存入企业id
@@ -407,7 +407,14 @@ func getGroup(groupStr string) (s int) {
 func checkGroup(userId, groupStr string, defaultGetAll ...bool) (map[int]bool, error) {
 	rData := db.Base.Query("SELECT id,s_name FROM follow_ent_monitor_group WHERE s_userid=?", userId)
 	if rData == nil || len(*rData) == 0 {
-		return nil, fmt.Errorf("未查询到标签")
+		//新用户插入分组
+		if _, err := db.Base.ExecBySql(fmt.Sprintf(`INSERT INTO follow_ent_monitor_group (s_name, s_userid, create_time, update_time, isPut, isdefGoup) VALUES
+        ('默认分组', '%s',  '2025-01-03 12:00:00', '2025-01-13 12:00:00', 0, 1),
+        ('竞争对手', '%s',  '2024-01-02 12:00:00', '2025-01-13 12:00:00', 1, 0),
+        ('合作伙伴', '%s',  '2024-01-01 12:00:00', '2025-01-13 12:00:00', 1, 0);`, userId, userId, userId)); err != nil {
+			log.Printf("新用户 %s创建分组异常", userId)
+		}
+		return nil, nil
 	}
 	var (
 		hasGroupId = map[int]bool{}
@@ -701,6 +708,7 @@ func (this *EntFollow) GetFollowEntInfo() (used int64, surplus int64) {
 
 func (this *EntFollow) GetLabelGroup() *[]map[string]interface{} {
 	defIdMap := make(map[int]bool)
+	//检测默认分组 初始化
 	count := db.Base.Count("follow_ent_monitor_group", map[string]interface{}{
 		"s_userid":  this.UserId,
 		"isdefGoup": 1,
@@ -743,15 +751,8 @@ INNER  JOIN  follow_ent_monitor_group c on c.s_userid = '%s' and c.id = b.s_grou
 }
 
 func (this *EntFollow) AddLabelGroup(name string) error {
-	if db.Base.Count("follow_ent_monitor_group", map[string]interface{}{
-		"user_id":   this.UserId,
-		"isdefGoup": 1,
-	}) == 0 { //初始化默认分组
-		db.Base.SelectBySql(fmt.Sprintf(`INSERT INTO follow_ent_monitor_group (s_name, s_userid, create_time, update_time, isPut, isdefGoup) VALUES
-('默认分组', '%s',  '2025-01-03 12:00:00', '2025-01-13 12:00:00', 0, 1),
-('竞争对手', '%s',  '2024-01-02 12:00:00', '2025-01-13 12:00:00', 1, 0),
-('合作伙伴', '%s',  '2024-01-01 12:00:00', '2025-01-13 12:00:00', 1, 0);`, this.UserId, this.UserId, this.UserId))
-	}
+	//检测默认分组 初始花
+	DefaultGroupInit(this.UserId)
 	if db.Base.Count("follow_ent_monitor_group", map[string]interface{}{
 		"user_id": this.UserId,
 		"s_name":  name,
@@ -851,12 +852,17 @@ func (this *EntFollow) DelLabelGroup(groupId string) error {
 
 func (this *EntFollow) GetFollowGroupList() (groupUserArr []EntFollowGroup, err error) {
 	groupMap := make(map[int]int)
-	flistSql := fmt.Sprintf(`SELECT  m.s_entId,g.id as groupId  from follow_ent_monitor m inner join follow_ent_monitor_group g on(m.s_userid =g.s_userid and g.s_userid ='%s') INNER JOIN follow_ent_monitor_relationship r  on ( g.id=r.s_groupId and m.s_entId=r.s_entId ) GROUP BY s_entId  ORDER BY m.l_lastpushtime DESC,m.l_createtime DESC LIMIT %d,%d`, this.UserId, 0, this.MaxNum)
+	DefaultGroupInit(this.UserId)
+	flistSql := fmt.Sprintf(`SELECT  m.s_entId,GROUP_CONCAT(g.id SEPARATOR ',') as gs from follow_ent_monitor m inner join follow_ent_monitor_group g on(m.s_userid =g.s_userid and g.s_userid ='%s') INNER JOIN follow_ent_monitor_relationship r  on ( g.id=r.s_groupId and m.s_entId=r.s_entId ) GROUP BY s_entId  ORDER BY m.l_lastpushtime DESC,m.l_createtime DESC LIMIT %d,%d`, this.UserId, 0, this.MaxNum)
 	log.Print("我关注的企业列表开始查询:", flistSql)
 	res := db.Base.SelectBySql(flistSql)
 	if res != nil && len(*res) > 0 {
 		for _, m := range *res {
-			groupMap[qutil.IntAll(m["groupId"])]++
+			for _, gId := range strings.Split(gconv.String(m["gs"]), ",") {
+				if groupId := gconv.Int(gId); groupId > 0 {
+					groupMap[groupId]++
+				}
+			}
 		}
 	}
 	data := db.Base.SelectBySql(fmt.Sprintf(`SELECT
@@ -882,3 +888,15 @@ ORDER BY
 	}
 	return
 }
+
+func DefaultGroupInit(userId string) {
+	if db.Base.Count("follow_ent_monitor_group", map[string]interface{}{
+		"user_id":   userId,
+		"isdefGoup": 1,
+	}) == 0 { //初始化默认分组
+		db.Base.SelectBySql(fmt.Sprintf(`INSERT INTO follow_ent_monitor_group (s_name, s_userid, create_time, update_time, isPut, isdefGoup) VALUES
+('默认分组', '%s',  '2025-01-03 12:00:00', '2025-01-13 12:00:00', 0, 1),
+('竞争对手', '%s',  '2024-01-02 12:00:00', '2025-01-13 12:00:00', 1, 0),
+('合作伙伴', '%s',  '2024-01-01 12:00:00', '2025-01-13 12:00:00', 1, 0);`, userId, userId, userId))
+	}
+}

src/jfw/modules/publicapply/src/activityday/dao/dao.go

@@ -78,6 +78,13 @@ func GetLotteryActiveInfo(activeId int64, session *httpsession.Session, req *htt
 	} else {
 		pic = ""
 	}
+	bigPic := ""
+	bgPicMap := common.ObjToMap(r.DLai.BgPic)
+	if bgPicMap != nil {
+		bigPic = common.ObjToString((*bgPicMap)[platform])
+	} else {
+		bigPic = ""
+	}
 	activeInfo.Lai = &Lai{
 		Name:             r.DLai.Name,
 		LotteryStartTime: r.DLai.LotteryStartTime,
@@ -87,6 +94,7 @@ func GetLotteryActiveInfo(activeId int64, session *httpsession.Session, req *htt
 		ShareCopy:        r.DLai.ShareCopy,
 		Pic:              pic,
 		Mold:             r.DLai.Mold,
+		BgPic:            bigPic,
 	}
 	//奖品信息
 	if r.DLpi, err = r.PrizeInfo(); err != nil {

src/jfw/modules/publicapply/src/activityday/dao/raffle.go

@@ -273,6 +273,7 @@ func (r *RaffleInfo) ActiveInfo() (ai *Lai, err error) {
 			Mold:             common.IntAll((*data)[0]["mold"]),
 			DeviceNum:        common.IntAll((*data)[0]["device_num"]),
 			IpNum:            common.IntAll((*data)[0]["ip_num"]),
+			BgPic:            common.ObjToString((*data)[0]["bg_pic"]),
 		}
 		errRule := json.Unmarshal([]byte(common.ObjToString((*data)[0]["rule"])), &ai.Rule)
 		if errRule != nil {

src/jfw/modules/publicapply/src/activityday/entity/entity.go

@@ -16,6 +16,7 @@ type LotteryActiveInfo struct {
 	Rule             []map[string]string  `json:"rule"`               //活动规则
 	ShareCopy        map[string]ShareCopy `json:"share_copy"`         //分享文案
 	Mold             int                  `json:"mold"`               //活动类型 0：购买奖励；1：抽奖
+	BgPic            string               `json:"bg_pic"`             //活动奖品背景图片
 }
 
 // 分享文案

src/web/staticres/common-module/active/202402/202402.js

@@ -164,6 +164,14 @@ var task = new Vue({
       var conf = this.activityConf
       return conf.mold === 1
     },
+    machineStyle: function() {
+      const pic = this.activityConf.bg_pic
+      if (pic) {
+        return {
+          'background-image': `url(${pic})`
+        }
+      }
+    },
     // 订单抽奖活动
     orderMold: function () {
       var conf = this.activityConf

src/web/staticres/frontRouter/pc/activity/js/202402.js

@@ -204,6 +204,14 @@ var task = new Vue({
       var conf = this.activityConf
       return conf.mold === 1
     },
+    machineStyle: function() {
+      const pic = this.activityConf.bg_pic
+      if (pic) {
+        return {
+          'background-image': `url(${pic})`
+        }
+      }
+    },
     // 订单抽奖活动
     orderMold: function () {
       var conf = this.activityConf

src/web/templates/frontRouter/pc/activity/free/202402.html

@@ -54,7 +54,7 @@
             </div>
             <div class="header-banner-content w">
                 <div class="header-banner-content-time">${activeStartTime} - ${activeEndTime}</div>
-                <div class="header-banner-machine m-c">
+                <div class="header-banner-machine m-c" :style="machineStyle">
                     <div class="machine-title" v-if="pointsMold">${activityConf.cost}剑鱼币抽会员</div>
                     <div class="machine-ani-content machine-canvas" id="ballBox">
                         <div class="machine-ball-list">

src/web/templates/frontRouter/wx/activity/free/202402.html

@@ -41,7 +41,7 @@
                 </div>
                 <div class="header-banner-content">
                     <div class="header-banner-content-time">${activeStartTime} - ${activeEndTime}</div>
-                    <div class="header-banner-machine">
+                    <div class="header-banner-machine" :style="machineStyle">
                         <div class="machine-title" v-if="pointsMold">${activityConf.cost}剑鱼币抽会员</div>
                         <div class="machine-ani-content machine-canvas" id="ballBox">
                             <div class="machine-ball-list">