Merge branch 'feature/3.10' into 'master'

feature/3.10

See merge request !14

cv/user_cv/bag.go

@@ -16,6 +16,7 @@ type UserBag struct {
 	Count         mysql.Num    `json:"count"`         // 拥有数量
 	RemainDays    int          `json:"remainDays"`    // 有效天数
 	TextStyleList []*TextStyle `json:"textStyleList"` // 文本样式
+	HasGiftText   bool         `json:"hasGiftText"`   // 是否有礼物文字
 }
 
 type TextStyle struct {

domain/model/res_m/gift.go

@@ -22,6 +22,7 @@ type ResGift struct {
 	Together          bool
 	Status            mysql.UserYesNo
 	GiftType          mysql.Type
+	HasGiftText       bool
 }
 
 // 获取所有的礼物

route/user_r/bag.go

@@ -46,16 +46,17 @@ func UserBag(c *gin.Context) (*mycontext.MyContext, error) {
 		for _, bagGift := range userBagGifts {
 			if gift, ok := allGifts[bagGift.ResId]; ok {
 				info := user_cv.UserBag{
-					BagId:      bagGift.ID,
-					ResType:    res_e.ResUserBagGift,
-					ResId:      gift.ID,
-					GiftId:     gift.ID,
-					Name:       gift.Name,
-					DiamondNum: gift.DiamondNum,
-					IconUrl:    gift.IconUrl,
-					SvgaUrl:    gift.SvagUrl,
-					Count:      bagGift.Count,
-					RemainDays: int(bagGift.EndTime.Sub(time.Now()).Hours() / 24),
+					BagId:       bagGift.ID,
+					ResType:     res_e.ResUserBagGift,
+					ResId:       gift.ID,
+					GiftId:      gift.ID,
+					Name:        gift.Name,
+					DiamondNum:  gift.DiamondNum,
+					IconUrl:     gift.IconUrl,
+					SvgaUrl:     gift.SvagUrl,
+					Count:       bagGift.Count,
+					RemainDays:  int(bagGift.EndTime.Sub(time.Now()).Hours() / 24),
+					HasGiftText: gift.HasGiftText,
 				}
 				if gift.ID == cp_e.CpConfessionGiftId { // 如果是cp告白礼物
 					info.TextStyleList = make([]*user_cv.TextStyle, 0, 2)