Merge branch 'release/v4.9.2_ws' of qmx/jy into release/v4.9.2

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

@@ -57,6 +57,15 @@ func GetLotteryActiveInfo(activeId int64, sess map[string]interface{}, session *
 	} else {
 		pic = ""
 	}
+	activeInfo.Lai = &Lai{
+		Name:             r.DLai.Name,
+		LotteryStartTime: r.DLai.LotteryStartTime,
+		LotteryEndTime:   r.DLai.LotteryEndTime,
+		Cost:             r.DLai.Cost,
+		Rule:             r.DLai.Rule,
+		ShareCopy:        r.DLai.ShareCopy,
+		Pic:              pic,
+	}
 	//奖品信息
 	if r.DLpi, err = r.PrizeInfo(); err != nil {
 		activeInfo.Msg = "暂无奖品信息"
@@ -69,15 +78,6 @@ func GetLotteryActiveInfo(activeId int64, sess map[string]interface{}, session *
 			})
 		}
 	}
-	activeInfo.Lai = &Lai{
-		Name:             r.DLai.Name,
-		LotteryStartTime: r.DLai.LotteryStartTime,
-		LotteryEndTime:   r.DLai.LotteryEndTime,
-		Cost:             r.DLai.Cost,
-		Rule:             r.DLai.Rule,
-		ShareCopy:        r.DLai.ShareCopy,
-		Pic:              pic,
-	}
 	activeInfo.Prize = prizeRs
 	//活动已结束
 	if activeInfo.ActiveEndTime < now.Unix() {