Revert "feat:调整结构体"

This reverts commit aaa2c006.

_const/enum/gift_e/enum.go

-package gift_e
-
-import "git.hilo.cn/hilo-common/resource/mysql"
-
-type GiftOperateSceneType mysql.Type
-
-const (
-	//匹配声网中场景
-	MatchVedioSceneType GiftOperateSceneType = 1
-	// 私聊
-	PriveChatSceneType GiftOperateSceneType = 2
-	//1对1视频
-	VideoSceneType GiftOperateSceneType = 3
-	//群组
-	GroupSceneType GiftOperateSceneType = 4
-)
-
-type ResGiftAvatarType = mysql.Type
-
-const (
-	SendGiftCpGiftAvatarType    ResGiftAvatarType = 1 //周CP
-	MonthlyWealthGiftAvatarType ResGiftAvatarType = 2 //月冠财富榜
-	MonthlyCharmGiftAvatarType  ResGiftAvatarType = 3 //月冠魅力榜
-	MonthlyPayGiftAvatarType    ResGiftAvatarType = 4 //月冠充值榜
-	WeekStarGiftAvatarType      ResGiftAvatarType = 5 //周星榜
-	CountryStarGiftAvatarType   ResGiftAvatarType = 6 // 国家之星
-)
-
-type GiftPrivateRecordType = mysql.Type
-
-const (
-	PrivateRecord   GiftPrivateRecordType = 1
-	VideoTradeUnion GiftPrivateRecordType = 2
-)
-
-type GiftColumnType = uint16
-
-const (
-	GiftColumnGift    GiftColumnType = 1 // 礼物
-	GiftColumnRomance GiftColumnType = 2 // 浪漫
-	GiftColumnCountry GiftColumnType = 3 // 国家
-	GiftColumnCustom  GiftColumnType = 4 // 定制
-)
-
-type GiftTagType = uint16
-
-const (
-	GiftTagMedal      GiftTagType = 1 // 勋章礼物
-	GiftTagWeeklyStar GiftTagType = 2 // 周星礼物
-)
-
-type GiftEntryType = uint16
-
-const (
-	GiftEntryWeeklyStar  GiftEntryType = 1 // 周星活动入口
-	GiftEntryWeeklyCp    GiftEntryType = 2 // 周CP活动入口
-	GiftEntryMedal       GiftEntryType = 3 // 勋章激活动入口
-	GiftEntryCountryStar GiftEntryType = 4 // 国家之星活动入口
-)

cv/user_cv/bag.go

@@ -2,23 +2,16 @@ package user_cv
 
 import (
 	"git.hilo.cn/hilo-common/resource/mysql"
-	"hilo-user/_const/enum/gift_e"
 )
 
 type UserBag struct {
-	BagId          mysql.ID             `json:"bagId"`           // 背包id
-	ResType        mysql.Type           `json:"resType"`         // 道具类型 1:礼物道具
-	ResId          mysql.ID             `json:"resId"`           // 道具资源id
-	GiftId         mysql.ID             `json:"giftId"`          // 礼物id,同礼物面板结构体
-	Name           string               `json:"name"`            // 资源名称
-	DiamondNum     mysql.Num            `json:"diamondNum"`      // 钻石数量
-	IconUrl        string               `json:"iconUrl"`         // icon url
-	SvgaUrl        string               `json:"svgaUrl"`         // svga url
-	Count          mysql.Num            `json:"count"`           // 拥有数量
-	RemainDays     int                  `json:"remainDays"`      // 有效天数
-	Tags           []gift_e.GiftTagType `json:"tags"`            // 角标
-	ShowEntry      bool                 `json:"showEntry"`       // 是否显示快捷入口
-	GroupBroadcast bool                 `json:"group_broadcast"` // 是否群组群发
-	SenderAvatar   string               `json:"senderAvatar"`    // key：sender_avatar
-	ReceiverAvatar string               `json:"receiverAvatar"`  // key：receiver_avatar
+	BagId      mysql.ID   `json:"bagId"`      // 背包id
+	ResType    mysql.Type `json:"resType"`    // 道具类型 1:礼物道具
+	ResId      mysql.ID   `json:"resId"`      // 道具资源id
+	Name       string     `json:"name"`       // 资源名称
+	DiamondNum mysql.Num  `json:"diamondNum"` // 钻石数量
+	IconUrl    string     `json:"iconUrl"`    // icon url
+	SvgaUrl    string     `json:"svgaUrl"`    // svga url
+	Count      mysql.Num  `json:"count"`      // 拥有数量
+	RemainDays int        `json:"remainDays"` // 有效天数
 }

route/user_r/bag.go

@@ -31,8 +31,6 @@ func UserBag(c *gin.Context) (*mycontext.MyContext, error) {
 	if err != nil {
 		return myCtx, err
 	}
-	//weeklyStarGifts, _ := activity_m.GetWeeklyStartGift(model)
-	//medalGifts, _ := res_m.FindMedalPublicObtainAll(model.Db)
 	var results []user_cv.UserBag
 	switch res_e.ResUserBag(resType) {
 	case res_e.ResUserBagGift:
@@ -47,19 +45,15 @@ func UserBag(c *gin.Context) (*mycontext.MyContext, error) {
 		for _, bagGift := range userBagGifts {
 			if gift, ok := allValidGifts[bagGift.ResId]; ok {
 				results = append(results, 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),
-					Tags:           nil,   // todo
-					ShowEntry:      false, // todo
-					GroupBroadcast: gift.GroupBroadcast,
+					BagId:      bagGift.ID,
+					ResType:    res_e.ResUserBagGift,
+					ResId:      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),
 				})
 			}
 		}