feat:等级奖励

_const/enum/headwear_e/headwear.go

+package headwear_e
+
+import "git.hilo.cn/hilo-common/resource/mysql"
+
+type UserHeadwearUsing = mysql.Type
+
+const (
+	YesUsing UserHeadwearUsing = 1
+	NoUsing  UserHeadwearUsing = 0
+)
+
+type UserHeadwearLogOrginType = mysql.Type
+
+const (
+	Mgr UserHeadwearLogOrginType = 1
+	//购买，或者别人购买
+	Send     UserHeadwearLogOrginType = 2
+	Activity UserHeadwearLogOrginType = 3
+	Rocket   UserHeadwearLogOrginType = 4
+	//活动阀值自动触发奖励
+	ActivityTrigger UserHeadwearLogOrginType = 5
+	//首次充值奖励
+	ActivityRechargeFirst UserHeadwearLogOrginType = 6
+	//别人赠送
+	Give            UserHeadwearLogOrginType = 7
+	GeneralActivity UserHeadwearLogOrginType = 8
+)
+
+type UserHeadwearLogType mysql.Type
+
+const (
+	AddSecond     UserHeadwearLogType = 1
+	UpdateEndTime UserHeadwearLogType = 2
+	Del           UserHeadwearLogType = 3
+)

_const/enum/msg_e/enum.go

+package msg_e
+
+import "git.hilo.cn/hilo-common/resource/mysql"
+
+//消息发送类型，消息接收者是谁 1：通知 2：官网 3:被喜欢通知 （注意：MsgReceiveType 同 MsgUserRecordType 不是树形关系s）
+//MsgReceive 结构体服务
+type MsgReceiveType = mysql.Type
+
+const (
+	//小助手的通知
+	UserMsgReceiveType MsgReceiveType = 1
+	//系统的通知
+	SysMsgReceiveType MsgReceiveType = 2
+	//喜欢消息
+	LikeMeReceiveType MsgReceiveType = 3
+	//工会用户通知
+	TradeUnionReceiveType MsgReceiveType = 4
+	//用户召回
+	UserRecall MsgReceiveType = 5
+	//video请求
+	VideoSend MsgReceiveType = 6
+	//访问
+	VisitReceiveType MsgReceiveType = 7
+	//拉黑
+	BlockReceiveType MsgReceiveType = 8
+	//短信验证码
+	SmsCode MsgReceiveType = 9
+)
+
+//跳转类型 0:无调整 1：网页跳转 2：app跳转 3：跳转到钻石 4：跳转到背包
+type ActionType = uint16
+
+const (
+	NonActionType ActionType = 0
+	WebActionType ActionType = 1
+	AppActionType ActionType = 2
+)
+
+//消息记录类型(设计的不好，应该是根据消息样式类型设计，而不是业务类型，渣渣)
+type MsgUserRecordType = mysql.Type
+
+const (
+	//新用户
+	//NewUserType MsgUserRecordType = 1
+	//举报
+	ReportType MsgUserRecordType = 2
+	//喜欢我
+	//LikeMeType MsgUserRecordType = 3
+	//重置图片
+	ResetAvatarType MsgUserRecordType = 4
+	//
+	//喜欢我
+	LikeMeType MsgUserRecordType = 5
+	//访问
+	VisitType MsgUserRecordType = 6
+	//新匹配记录
+	MatchHistoryType MsgUserRecordType = 7
+	//互相喜欢
+	LikeEachType MsgUserRecordType = 8
+	//你获得s%钻石的礼物收益！
+	DiamondIncome MsgUserRecordType = 9
+	//榜单结果
+	ActivityBillboardResult MsgUserRecordType = 10
+	//榜单钻石收益
+	ActivityBillboardDiamond MsgUserRecordType = 11
+	//榜单坐骑收益
+	ActivityBillboardProperty MsgUserRecordType = 12
+	//通过收礼物获得豆子
+	ActivityBeanProperty MsgUserRecordType = 13
+	//管理人送钻石
+	MgrSendDiamondProperty MsgUserRecordType = 14
+	//群组榜单钻石收益
+	ActivityGroupBillboardDiamond MsgUserRecordType = 15
+	//群组榜单坐骑收益
+	ActivityGroupBillboardProperty MsgUserRecordType = 16
+	//群组支持收益
+	GroupSupport MsgUserRecordType = 17
+	//群组支持提醒结果
+	GroupSupportResult MsgUserRecordType = 18
+	//管理人送座驾
+	MgrSendProperty MsgUserRecordType = 19
+	//送道具（座驾，头饰都属于道具）
+	AddProps MsgUserRecordType = 20
+	//MISS活动获胜
+	ActivityBillboardBeLikeResult = 21
+	//CP活动获胜
+	ActivityBillboardCpResult = 22
+	//加入势力主
+	GroupPowerUserJoin = 23
+	//离开势力主
+	GroupPowerUserLeave = 24
+	//贵族
+	AddNoble = 25
+	//日充值活动通知
+	ActivityTriggerDayPay = 26
+	//也门活动通知
+	ActivityTriggerYemen = 27
+	//月充值活动通知
+	ActivityTriggerMonthPay  = 28
+	FruitTycoonAward         = 29 // 水果大亨获奖
+	LuckyboxRecycle          = 30 //幸运盒子回收
+	HlTemp1                  = 31 //产品黄蕾，2022/06/29 临时要求发给某人的小助手消息
+	HLTemp2                  = 32 //问卷调查
+	NewUserInviteAuditPassed = 33 // 新用户奖励活动审核通过
+	NewUserInviteAuditFailed = 34 // 新用户奖励活动审核不通过
+	NewUserInviterAward      = 35 // 新用户奖励活动邀请成功数达标
+	PowerSupportSalary       = 36 // 势力扶持工资领取 提醒
+	CountryStarOrdinaryAward = 37 // 国家之星瓜分奖提醒
+	GroupActivityRewardMsg   = 38 // 群组活动钻石奖励提醒
+	TemplateActAwardMsg      = 39 // 通用模板活动奖励提醒
+	TemplateSmsCode          = 40 // 通用模板活动奖励提醒
+)
+
+type MsgSysUserType = mysql.Type
+
+const (
+	//系统消息
+	SysType MsgSysUserType = 1
+	//小助手消息
+	AssistantType MsgSysUserType = 2
+)
+
+//resMsgTransalte 中 msg_type 同 type， msg_type是属于一级类型 type属于二级类型。 msg_type 对应MsgReceiveType type：部分对应MsgUserRecordType MsgUserRecordType（应该是小助手的类型）
+type MsgSysRecordType = mysql.Type
+
+const (
+	//这个值木有意义，
+	SysMsgSysRecordType1 MsgSysRecordType = 1
+	SysMsgSysRecordType2 MsgSysRecordType = 2
+)

_const/enum/property_e/enum.go

+package property_e
+
+import "git.hilo.cn/hilo-common/resource/mysql"
+
+type UserPropertyUsing = mysql.Type
+
+const (
+	YesUsing UserPropertyUsing = 1
+	NoUsing  UserPropertyUsing = 0
+)
+
+type UserPropertyLogOrginType = mysql.Type
+
+const (
+	//活动奖励
+	ActivityBillboardReward UserPropertyLogOrginType = 1
+	//
+	Operational UserPropertyLogOrginType = 2
+	//群组活动
+	ActivityGroupBillboardReward UserPropertyLogOrginType = 3
+	//赠送
+	Send UserPropertyLogOrginType = 4
+	//火箭游戏
+	Rocket UserPropertyLogOrginType = 5
+	//活动阀值触发奖励
+	ActivityBillboardTrigger UserPropertyLogOrginType = 6
+	//首次充值奖励
+	ActivityRechargeFirst UserPropertyLogOrginType = 7
+	Give                  UserPropertyLogOrginType = 8
+	GeneralActivity       UserPropertyLogOrginType = 9 // 一般性活动
+)
+
+type UserPropertyLogType mysql.Type
+
+const (
+	AddSecond     UserPropertyLogType = 1
+	UpdateEndTime UserPropertyLogType = 2
+	Del           UserPropertyLogType = 3
+)
+
+type PropertyType = uint16
+
+const (
+	TypeNoble     PropertyType = 1
+	TypeMedal     PropertyType = 2
+	TypeHeaddress PropertyType = 3
+	TypeRide      PropertyType = 4
+)

domain/model/bag_m/user_bag.go

@@ -69,8 +69,10 @@ func GetUserBag(model *domain.Model, bagId mysql.ID) (*UserBag, error) {
 //	0.事务操作
 //  1.背包表
 //  2.明细表
-func AddUserBag(model *domain.Model, userId mysql.ID, resType mysql.Type, resId mysql.ID, count mysql.Num, day int, reason string) error {
-	return model.Transaction(func(model *domain.Model) error {
+// return bagId
+func AddUserBag(model *domain.Model, userId mysql.ID, resType mysql.Type, resId mysql.ID, count mysql.Num, day int, reason string) (mysql.ID, error) {
+	var bagId mysql.ID
+	err := model.Transaction(func(model *domain.Model) error {
 		//  1.背包表
 		endTime := time.Now().AddDate(0, 0, day)
 		userBag := &UserBag{
@@ -86,6 +88,7 @@ func AddUserBag(model *domain.Model, userId mysql.ID, resType mysql.Type, resId
 		}).Create(userBag).Error; err != nil {
 			return err
 		}
+		bagId = userBag.ID // 自增id
 		//  2.明细表
 		userBagDetail := &UserBagDetail{
 			UserId:    userId,
@@ -103,4 +106,5 @@ func AddUserBag(model *domain.Model, userId mysql.ID, resType mysql.Type, resId
 		}
 		return nil
 	})
+	return bagId, err
 }

domain/model/msg_m/factory.go

+package msg_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-user/myerr"
+)
+
+func GetMsgSysRecordInit(model *domain.Model, t uint32, msgSysId uint64) *MsgSysRecord {
+	return &MsgSysRecord{
+		Model:    model,
+		Type:     t,
+		Status:   mysql.EXIST,
+		MsgSysId: msgSysId,
+	}
+}
+
+func GetMsgSysRecord(model *domain.Model, msgSysId uint64) (*MsgSysRecord, error) {
+	msgSysRecord := MsgSysRecord{}
+	if err := model.Db.Model(&MsgSysRecord{}).Where(&MsgSysRecord{
+		MsgSysId: msgSysId,
+	}).First(&msgSysRecord).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	} else {
+		msgSysRecord.Model = model
+		return &msgSysRecord, nil
+	}
+}

domain/model/msg_m/msg.go

+package msg_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"git.hilo.cn/hilo-common/sdk/emas"
+	"git.hilo.cn/hilo-common/utils"
+	"hilo-user/_const/enum/msg_e"
+)
+
+type MsgUserRecord struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	UserId        mysql.ID
+	Type          msg_e.MsgUserRecordType
+	Nick          mysql.Str
+	NickUserId    mysql.ID //用户的别名
+	DiamondIncome mysql.Str
+	DayNum        mysql.Str //多少天
+	PropertyUrl   mysql.Str //道具地址
+	BeanNum       mysql.Str //多少豆子
+	GroupCode     mysql.Str //群组code
+}
+
+type MsgSysRecord struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	//Type          msg_m.MsgSysRecordType
+	Type     uint32
+	Status   mysql.LogicDel
+	MsgSysId mysql.ID
+}
+
+//系统消息，用户最后已读的位置
+type MsgSysUser struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	Type          msg_e.MsgSysUserType
+	UserId        mysql.ID
+	MsgSysLastId  mysql.ID
+}
+
+//删除
+func (msgSysRecord *MsgSysRecord) Del() *MsgSysRecord {
+	msgSysRecord.Status = mysql.DEL
+	return msgSysRecord
+}
+
+type MsgReceive struct {
+	Type msg_e.MsgReceiveType `json:"type"`
+	//Timestamp mysql.Timestamp `json:"timestamp"`
+}
+
+func NewUserRecord(model *domain.Model, userId mysql.ID, t msg_e.MsgUserRecordType, nick mysql.Str, nickUserId mysql.ID, diamondIncome mysql.Str, dayNum mysql.Str, propertyUrl mysql.Str, beanNum mysql.Str, groupCode mysql.Str) *MsgUserRecord {
+	return &MsgUserRecord{
+		Model:         model,
+		UserId:        userId,
+		Type:          t,
+		Nick:          nick,
+		NickUserId:    nickUserId,
+		DiamondIncome: diamondIncome,
+		DayNum:        dayNum,
+		PropertyUrl:   propertyUrl,
+		BeanNum:       beanNum,
+		GroupCode:     groupCode,
+	}
+}
+
+// 发给小助手的消息, 不需要抛出错误
+func SendEmasMsgAssistant(model *domain.Model, externalId string, deviceType string) error {
+	str, _ := utils.ToString(MsgReceive{
+		Type: msg_e.UserMsgReceiveType,
+	})
+	err := emas.SendMsg(externalId, deviceType, str)
+	if err != nil {
+		model.Log.Errorf("emas.SendMsg err:%v", err)
+	}
+	return nil
+}

domain/model/msg_m/repo.go

+package msg_m
+
+import (
+	"hilo-user/domain/model"
+	"hilo-user/myerr"
+)
+
+func (msgUserRecord *MsgUserRecord) Persistent() error {
+	if err := model.Persistent(msgUserRecord.Db, msgUserRecord); err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+func (msgSysRecord *MsgSysRecord) Persistent() error {
+	if err := model.Persistent(msgSysRecord.Db, msgSysRecord); err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+func (msgSysUser *MsgSysUser) Persistent() error {
+	return model.Persistent(msgSysUser.Db, msgSysUser)
+}
\ No newline at end of file

domain/model/noble_m/config.go

+package noble_m
+
+import (
+	"gorm.io/gorm"
+	"time"
+)
+
+const RENEWAL_LIMIT_DAY = 7
+
+type ResNoble struct {
+	Level         uint16
+	PurchasePrice uint32
+	RenewalPrice  uint32
+	Duration      uint16
+	PicUrl        string
+	DailyGold     uint
+	RideId        uint64 // 赠送的座驾ID
+	HeaddressId   uint64 // 赠送的头饰ID
+}
+
+func GetAllConfig(db *gorm.DB) ([]ResNoble, error) {
+	rows := make([]ResNoble, 0)
+	err := db.Find(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func GetAllConfigMap(db *gorm.DB) (map[uint16]ResNoble, error) {
+	rows, err := GetAllConfig(db)
+	if err != nil {
+		return nil, err
+	}
+	result := make(map[uint16]ResNoble, 0)
+	for _, i := range rows {
+		result[i.Level] = i
+	}
+	return result, nil
+}
+
+func GetConfigByLevel(db *gorm.DB, level uint16) (ResNoble, error) {
+	r := ResNoble{}
+	if err := db.Model(&ResNoble{}).First(&r, level).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return r, nil
+		} else {
+			return r, err
+		}
+	}
+	return r, nil
+}
+
+// 根据过期时间推算价格
+func CalcPrice(cfg ResNoble, endTime time.Time) uint32 {
+	now := time.Now()
+	price := cfg.RenewalPrice
+	if now.After(endTime.AddDate(0, 0, RENEWAL_LIMIT_DAY)) {
+		price = cfg.PurchasePrice
+	}
+	return price
+}

domain/model/noble_m/nobleLog.go

+package noble_m
+
+import (
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"time"
+)
+
+const (
+	SRC_APP        = 1 // APP
+	SRC_OPERATION  = 2 // 管理后台发放
+	SRC_H5         = 3 // H5页面
+	SRC_ACTIVITY   = 4 // 活动奖励
+	RECHARGE_FIRST = 5 // 首次充值
+)
+
+type UserNobleLog struct {
+	mysql.Entity
+	SenderId   uint64
+	ReceiverId uint64
+	Level      uint16
+	Money      uint32
+	SrcType    uint16
+	OldEndTime time.Time
+	NewEndTime time.Time
+}
+
+func (ubl *UserNobleLog) Create(db *gorm.DB) error {
+	return db.Create(ubl).Error
+}

domain/model/noble_m/userNoble.go

+package noble_m
+
+import (
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"time"
+)
+
+type UserNoble struct {
+	mysql.Entity
+	UserId  uint64
+	Level   uint16
+	EndTime time.Time
+}
+
+func (ub *UserNoble) Create(db *gorm.DB) error {
+	return db.Create(ub).Error
+}
+
+func (ub *UserNoble) UpdateEndTime(db *gorm.DB, endTime time.Time) (int64, error) {
+	r := db.Model(&UserNoble{}).Where(ub).Update("end_time", endTime)
+	return r.RowsAffected, r.Error
+}
+
+// 查询用户未过期的贵族
+func (ub *UserNoble) Find(db *gorm.DB) ([]UserNoble, error) {
+	rows := make([]UserNoble, 0)
+	if err := db.Where(ub).Where("end_time>=NOW()").Order("level DESC").Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+// 查询用户所有的贵族（包括已过期）
+func (ub *UserNoble) FindAll(db *gorm.DB) ([]UserNoble, error) {
+	rows := make([]UserNoble, 0)
+	if err := db.Where(ub).Order("level DESC").Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	return rows, nil
+}
+
+func RemoveNoble(db *gorm.DB, userId uint64, level uint16) error {
+	ub := UserNoble{
+		UserId: userId,
+		Level:  level,
+	}
+	return ub.Delete(db)
+}
+
+func (ub *UserNoble) Delete(db *gorm.DB) error {
+	return db.Where(ub).Delete(&UserNoble{}).Error
+}
+
+func FindActiveNoble(db *gorm.DB, userId uint64) (*UserNoble, error) {
+	ub := UserNoble{
+		UserId: userId,
+	}
+	records, err := ub.Find(db)
+	if err != nil {
+		return nil, err
+	}
+	if len(records) <= 0 {
+		return nil, nil
+	}
+	return &records[0], nil
+}
+
+func GetNobleLevel(db *gorm.DB, userId uint64) (uint16, error) {
+	noble, err := FindActiveNoble(db, userId)
+	if err != nil {
+		return 0, err
+	}
+	if noble == nil {
+		return 0, nil
+	} else {
+		return noble.Level, nil
+	}
+}
+
+func BatchGetNobleLevel(db *gorm.DB, userIds []uint64) (map[uint64]uint16, error) {
+	m, err := BatchGetActiveNoble(db, userIds)
+	if err != nil {
+		return nil, err
+	}
+	result := make(map[uint64]uint16, 0)
+	for _, i := range userIds {
+		result[i] = m[i].Level
+	}
+	return result, nil
+}
+
+func BatchGetActiveNoble(db *gorm.DB, userIds []uint64) (map[uint64]UserNoble, error) {
+	ub := UserNoble{}
+
+	records, err := ub.batchGet(db, userIds)
+	if err != nil {
+		return nil, err
+	}
+	result := make(map[uint64]UserNoble, 0)
+	for _, i := range userIds {
+		if len(records[i]) > 0 {
+			result[i] = records[i][0]
+		} else {
+			result[i] = UserNoble{}
+		}
+	}
+
+	return result, nil
+}
+
+// 查询用户未过期的贵族
+func (ub *UserNoble) batchGet(db *gorm.DB, userIds []uint64) (map[uint64][]UserNoble, error) {
+	rows := make([]UserNoble, 0)
+	if err := db.Model(ub).Where("end_time>=NOW() AND user_id IN ?", userIds).Order("level DESC").Find(&rows).Error; err != nil {
+		return nil, err
+	}
+	result := make(map[uint64][]UserNoble, 0)
+	for _, i := range rows {
+		if _, ok := result[i.UserId]; !ok {
+			result[i.UserId] = make([]UserNoble, 0)
+		}
+		result[i.UserId] = append(result[i.UserId], i)
+	}
+	return result, nil
+}

domain/model/repo.go

@@ -2,10 +2,10 @@ package model
 
 import (
 	"fmt"
+	"git.hilo.cn/hilo-common/resource/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"hilo-user/myerr"
-	"hilo-user/resource/mysql"
 	"time"
 )
 

domain/model/res_m/headwear.go

+package res_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-user/myerr"
+)
+
+type ResHeadwear struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	Name          mysql.Str
+	PicUrl        mysql.Str
+	EffectUrl     mysql.Str
+}
+
+//矛盾，项目负责人（产品不接受 商品 同上架分开两个数据结构的模式），又在页面上要求头饰同价格在一起展示，修改。
+//目前违背了，ResHeadwearDiamond 作为资源数据，不允许修改的特点。后果在于，对账错误。
+type ResHeadwearDiamond struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	ResHeadwearId mysql.ID
+	DiamondNum    mysql.Num
+	Second        mysql.Num
+	Status        mysql.UserYesNo
+}
+
+func InitResHeadwearDiamond(model *domain.Model, resHeadwearId mysql.ID, diamondNum mysql.Num, second mysql.Num) *ResHeadwearDiamond {
+	return &ResHeadwearDiamond{
+		Model:         model,
+		ResHeadwearId: resHeadwearId,
+		DiamondNum:    diamondNum,
+		Second:        second,
+		Status:        mysql.NOUSER,
+	}
+}
+
+func GetResHeadwearDiamondByHeadwearIdOrNil(model *domain.Model, resHeadwearId mysql.ID) (*ResHeadwearDiamond, error) {
+	resHeadwearDiamond := ResHeadwearDiamond{}
+	if err := model.Db.Model(&ResHeadwearDiamond{}).Where(&ResHeadwearDiamond{
+		ResHeadwearId: resHeadwearId,
+	}).First(&resHeadwearDiamond).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	resHeadwearDiamond.Model = model
+	return &resHeadwearDiamond, nil
+}
+
+func (resHeadwearDiamond *ResHeadwearDiamond) SetDiamondNum(diamondNum uint32) *ResHeadwearDiamond {
+	resHeadwearDiamond.DiamondNum = diamondNum
+	return resHeadwearDiamond
+}
+
+func (resHeadwearDiamond *ResHeadwearDiamond) SetSecond(second uint32) *ResHeadwearDiamond {
+	resHeadwearDiamond.Second = second
+	return resHeadwearDiamond
+}
+
+//设置成未使用
+func (resHeadwearDiamond *ResHeadwearDiamond) SetUser() *ResHeadwearDiamond {
+	resHeadwearDiamond.Status = mysql.USER
+	return resHeadwearDiamond
+}
+
+//设置成未使用
+func (resHeadwearDiamond *ResHeadwearDiamond) SetNoUser() *ResHeadwearDiamond {
+	resHeadwearDiamond.Status = mysql.NOUSER
+	return resHeadwearDiamond
+}
+
+//id获取头饰，不存在则抛异常
+func GetHeadwearById(model *domain.Model, id mysql.ID) (*ResHeadwear, error) {
+	resHeadwear := ResHeadwear{}
+	if err := model.Db.Model(&ResHeadwear{}).First(&resHeadwear, id).Error; err != nil {
+		return nil, myerr.WrapErr(err)
+	} else {
+		resHeadwear.Model = model
+		return &resHeadwear, nil
+	}
+}
+
+//初始化头饰,
+func InitHeadwear(model *domain.Model, name string, picUrl string, effectUrl string) *ResHeadwear {
+	return &ResHeadwear{
+		Model:     model,
+		Name:      name,
+		PicUrl:    picUrl,
+		EffectUrl: effectUrl,
+	}
+}
+
+//修改头饰
+func (resHeadwear *ResHeadwear) EditName(name string) *ResHeadwear {
+	resHeadwear.Name = name
+	return resHeadwear
+}
+
+func (resHeadwear *ResHeadwear) EditPicUrl(picUrl string) *ResHeadwear {
+	resHeadwear.PicUrl = picUrl
+	return resHeadwear
+}
+
+func (resHeadwear *ResHeadwear) EditEffectUrl(effectUrl string) *ResHeadwear {
+	resHeadwear.EffectUrl = effectUrl
+	return resHeadwear
+}
+
+func CheckHeadwearValidById(model *domain.Model, id mysql.ID) (bool, error) {
+	resHeadwear := ResHeadwear{}
+	if err := model.Db.Model(&ResHeadwear{}).First(&resHeadwear, id).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return false, nil
+		} else {
+			return false, myerr.WrapErr(err)
+		}
+
+	} else {
+		return true, nil
+	}
+}

domain/model/user_m/headwear.go

+package user_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-user/_const/enum/headwear_e"
+	"hilo-user/domain/model/res_m"
+	"hilo-user/myerr"
+	"strconv"
+	"time"
+)
+
+//用户头饰
+type UserHeadwear struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	UserId        mysql.ID
+	HeadwearId    mysql.ID
+	EndTime       time.Time
+	Using         headwear_e.UserHeadwearUsing
+}
+
+//获取用户头饰，不存在则新建
+func GetUserHeadwearOrInit(model *domain.Model, userId mysql.ID, headwearId mysql.ID) (*UserHeadwear, error) {
+	//检查headwearId是否存在/有效
+	if flag, err := res_m.CheckHeadwearValidById(model, headwearId); err != nil {
+		return nil, err
+	} else {
+		if flag == false {
+			return nil, myerr.NewSysError("headwearId： " + strconv.FormatUint(headwearId, 10) + " 无效")
+		}
+	}
+
+	userHeadwear := UserHeadwear{}
+	if err := model.Db.Model(&UserHeadwear{}).Where(&UserHeadwear{
+		UserId:     userId,
+		HeadwearId: headwearId,
+	}).First(&userHeadwear).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return &UserHeadwear{
+				Model:      model,
+				UserId:     userId,
+				HeadwearId: headwearId,
+				EndTime:    time.Now(),
+			}, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	userHeadwear.Model = model
+	return &userHeadwear, nil
+}
+
+//设置为使用中
+func (userHeadwear *UserHeadwear) SetUsing() (*UserHeadwear, error) {
+	if err := resetAllUserHeadwearNoUsing(userHeadwear.Model, userHeadwear.UserId); err != nil {
+		return nil, err
+	}
+	userHeadwear.Using = headwear_e.YesUsing
+	return userHeadwear, nil
+}
+
+//增加结束时间
+func (userHeadwear *UserHeadwear) AddEndTime(t headwear_e.UserHeadwearLogOrginType, second uint32, operateUserId mysql.ID) (*UserHeadwear, mysql.ID, error) {
+	logId, err := addUserHeadwearLog(userHeadwear.Model, userHeadwear.UserId, userHeadwear.HeadwearId, t, headwear_e.AddSecond, &second, nil, operateUserId)
+	if err != nil {
+		return nil, 0, myerr.WrapErr(err)
+	}
+	//if err := resetAllUserHeadwearNoUsing(userHeadwear.Model, userHeadwear.UserId); err != nil {
+	//	return nil, logId, err
+	//}
+	nowTime := time.Now()
+	if userHeadwear.EndTime.After(nowTime) {
+		nowTime = userHeadwear.EndTime
+	}
+	userHeadwear.EndTime = nowTime.Add(time.Duration(second) * time.Second)
+	return userHeadwear, logId, nil
+}
+
+//删除
+func (userHeadwear *UserHeadwear) MgrDel(mgrId mysql.ID) (*UserHeadwear, mysql.ID, error) {
+	logId, err := addUserHeadwearLog(userHeadwear.Model, userHeadwear.UserId, userHeadwear.HeadwearId, headwear_e.Mgr, headwear_e.Del, nil, nil, mgrId)
+	if err != nil {
+		return nil, 0, myerr.WrapErr(err)
+	}
+	userHeadwear.SetDel()
+	return userHeadwear, logId, nil
+}
+
+//重置所有的座驾均为不使用状态
+func resetAllUserHeadwearNoUsing(model *domain.Model, userId mysql.ID) error {
+	if err := model.Db.Model(&UserHeadwear{}).Where(&UserHeadwear{
+		UserId: userId,
+	}).UpdateColumn("using", headwear_e.NoUsing).Error; err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+//用户装饰日志
+type UserHeadwearLog struct {
+	mysql.Entity
+	UserId        mysql.ID
+	OperateUserId mysql.ID
+	HeadwearId    mysql.ID
+	OriginType    headwear_e.UserHeadwearLogOrginType
+	Type          headwear_e.UserHeadwearLogType
+	AddSecond     *mysql.Num
+	UpdateEndTime *time.Time
+}
+
+//增加修改日志
+func addUserHeadwearLog(model *domain.Model, userId mysql.ID, headwearId mysql.ID, originType headwear_e.UserHeadwearLogOrginType, t headwear_e.UserHeadwearLogType, addSecond *uint32, UpdateEndTime *time.Time, operateUserId mysql.ID) (mysql.ID, error) {
+	userHeadwearLog := UserHeadwearLog{
+		UserId:        userId,
+		OperateUserId: operateUserId,
+		HeadwearId:    headwearId,
+		OriginType:    originType,
+		Type:          t,
+		AddSecond:     addSecond,
+		UpdateEndTime: UpdateEndTime,
+	}
+	if err := model.Db.Create(&userHeadwearLog).Error; err != nil {
+		return 0, myerr.WrapErr(err)
+	}
+	return userHeadwearLog.ID, nil
+}
+
+func GetUserHeadwearUsing(model *domain.Model, userId mysql.ID) (*UserHeadwear, error) {
+	userHeadwear := UserHeadwear{}
+	if err := model.Db.Model(&UserHeadwear{}).Where(&UserHeadwear{
+		UserId: userId,
+	}).Where("end_time > ?", time.Now()).Order("`using` desc, updated_time desc").First(&userHeadwear).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	userHeadwear.Model = model
+	return &userHeadwear, nil
+}

domain/model/user_m/property.go

+package user_m
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"gorm.io/gorm"
+	"hilo-user/_const/enum/property_e"
+	"hilo-user/myerr"
+	"time"
+)
+
+//用户道具
+type UserProperty struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	UserId        mysql.ID
+	PropertyId    mysql.ID
+	EndTime       time.Time
+	Using         property_e.UserPropertyUsing
+}
+
+func GetUserPropertyOrInit(model *domain.Model, userId mysql.ID, propertyId mysql.ID) (*UserProperty, error) {
+	userProperty := UserProperty{}
+	if err := model.Db.Model(&UserProperty{}).Where(&UserProperty{
+		UserId:     userId,
+		PropertyId: propertyId,
+	}).First(&userProperty).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return &UserProperty{
+				Model:      model,
+				UserId:     userId,
+				PropertyId: propertyId,
+				EndTime:    time.Now(),
+			}, nil
+		} else {
+			return nil, myerr.WrapErr(err)
+		}
+	}
+	userProperty.Model = model
+	return &userProperty, nil
+}
+
+//设置为使用中
+func (userProperty *UserProperty) SetUsing() (*UserProperty, error) {
+	if err := ResetAllUserPropertyNoUsing(userProperty.Model, userProperty.UserId); err != nil {
+		return nil, err
+	}
+	userProperty.Using = property_e.YesUsing
+	return userProperty, nil
+}
+
+//增加结束时间
+func (userProperty *UserProperty) AddEndTime(t property_e.UserPropertyLogOrginType, second uint32, operateUserId mysql.ID) (*UserProperty, mysql.ID, error) {
+	logId, err := addUserPropertyLog(userProperty.Model, userProperty.UserId, userProperty.PropertyId, t, property_e.AddSecond, &second, nil, operateUserId)
+	if err != nil {
+		return nil, 0, myerr.WrapErr(err)
+	}
+	//if err := ResetAllUserPropertyNoUsing(userProperty.Model, userProperty.UserId); err != nil {
+	//	return nil, logId, err
+	//}
+	nowTime := time.Now()
+	if userProperty.EndTime.After(nowTime) {
+		nowTime = userProperty.EndTime
+	}
+	userProperty.EndTime = nowTime.Add(time.Duration(second) * time.Second)
+	return userProperty, logId, nil
+}
+
+//重置所有的座驾均为不使用状态
+func ResetAllUserPropertyNoUsing(model *domain.Model, userId mysql.ID) error {
+	if err := model.Db.Model(&UserProperty{}).Where(&UserProperty{
+		UserId: userId,
+	}).UpdateColumn("using", property_e.NoUsing).Error; err != nil {
+		return myerr.WrapErr(err)
+	}
+	return nil
+}
+
+//增加修改日志
+func addUserPropertyLog(model *domain.Model, userId mysql.ID, propertyId mysql.ID, originType property_e.UserPropertyLogOrginType, t property_e.UserPropertyLogType, addSecond *uint32, UpdateEndTime *time.Time, operateUserId mysql.ID) (mysql.ID, error) {
+	userPropertyLog := UserPropertyLog{
+		UserId:        userId,
+		OperateUserId: operateUserId,
+		PropertyId:    propertyId,
+		OriginType:    originType,
+		Type:          t,
+		AddSecond:     addSecond,
+		UpdateEndTime: UpdateEndTime,
+	}
+	if err := model.Db.Create(&userPropertyLog).Error; err != nil {
+		return 0, myerr.WrapErr(err)
+	}
+	return userPropertyLog.ID, nil
+}
+
+func RemoveUserProperty(model *domain.Model, userId mysql.ID, propertyId mysql.ID) error {
+	return model.Db.Where("user_id = ? AND property_id = ?", userId, propertyId).Delete(&UserProperty{}).Error
+}
+
+//用户道具日志
+type UserPropertyLog struct {
+	mysql.Entity
+	*domain.Model `gorm:"-"`
+	UserId        mysql.ID
+	OperateUserId mysql.ID
+	PropertyId    mysql.ID
+	OriginType    property_e.UserPropertyLogOrginType
+	Type          property_e.UserPropertyLogType
+	AddSecond     *mysql.Num
+	UpdateEndTime *time.Time
+}
\ No newline at end of file

domain/model/user_m/repo.go

 package user_m
+
+import "hilo-user/domain/model"
+
+func (userHeadwear *UserHeadwear) Persistent() error {
+	return model.Persistent(userHeadwear.Db, userHeadwear)
+}
+
+func (userProperty *UserProperty) Persistent() error {
+	return model.Persistent(userProperty.Db, userProperty)
+}
+
+func (userPropertyLog *UserPropertyLog) Persistent() error {
+	return model.Persistent(userPropertyLog.Db, userPropertyLog)
+}

domain/service/headwear_s/headwear.go

+package headwear_s
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"hilo-user/_const/enum/headwear_e"
+	"hilo-user/domain/model/user_m"
+	"hilo-user/domain/service"
+	"hilo-user/myerr"
+	"hilo-user/myerr/bizerr"
+	"time"
+)
+
+type HeadwearService struct {
+	svc *service.Service
+}
+
+func NewHeadwearService(myContext *mycontext.MyContext) *HeadwearService {
+	svc := service.CreateService(myContext)
+	return &HeadwearService{svc}
+}
+
+// 下发头饰
+func (s *HeadwearService) SendHeadwear(receiverUserId mysql.ID, headdressId mysql.ID, days int) error {
+	var model = domain.CreateModelContext(s.svc.MyContext)
+	// 头饰增加
+	receiveHeadwearDuration := uint32(days) * 3600 * 24
+	if headdressId <= 0 {
+		return bizerr.InvalidParameter
+	}
+	userHeadwear, err := user_m.GetUserHeadwearOrInit(model, receiverUserId, headdressId)
+	if err != nil {
+		return err
+	}
+	nowTime := time.Now()
+	if userHeadwear.EndTime.After(nowTime) {
+		nowTime = userHeadwear.EndTime
+	}
+	userHeadwear.EndTime = nowTime.Add(time.Duration(receiveHeadwearDuration) * time.Second)
+	if err := userHeadwear.Persistent(); err != nil {
+		return err
+	}
+	//日志错误，并不事务回调
+	if _, err = addUserHeadwearLog(model, receiverUserId, headdressId, headwear_e.ActivityTrigger, headwear_e.AddSecond, &receiveHeadwearDuration, nil, 0); err != nil {
+		model.Log.Error(err)
+	}
+	return err
+}
+
+//增加修改日志
+func addUserHeadwearLog(model *domain.Model, userId mysql.ID, headwearId mysql.ID, originType headwear_e.UserHeadwearLogOrginType, t headwear_e.UserHeadwearLogType, addSecond *uint32, UpdateEndTime *time.Time, operateUserId mysql.ID) (mysql.ID, error) {
+	userHeadwearLog := user_m.UserHeadwearLog{
+		UserId:        userId,
+		OperateUserId: operateUserId,
+		HeadwearId:    headwearId,
+		OriginType:    originType,
+		Type:          t,
+		AddSecond:     addSecond,
+		UpdateEndTime: UpdateEndTime,
+	}
+	if err := model.Db.Create(&userHeadwearLog).Error; err != nil {
+		return 0, myerr.WrapErr(err)
+	}
+	return userHeadwearLog.ID, nil
+}

domain/service/noble_s/noble.go

+package noble_s
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"hilo-user/_const/enum/headwear_e"
+	"hilo-user/_const/enum/msg_e"
+	"hilo-user/_const/enum/property_e"
+	"hilo-user/domain/model/msg_m"
+	"hilo-user/domain/model/noble_m"
+	"hilo-user/domain/model/user_m"
+	"hilo-user/domain/service"
+	"hilo-user/myerr"
+	"hilo-user/myerr/bizerr"
+	"strconv"
+	"time"
+)
+
+type NobleService struct {
+	svc *service.Service
+}
+
+func NewNobleService(myContext *mycontext.MyContext) *NobleService {
+	svc := service.CreateService(myContext)
+	return &NobleService{svc}
+}
+
+// 下发贵族
+func (s *NobleService) SendNoble(receiverUserId mysql.ID, level uint16, days int) error {
+	model := domain.CreateModelContext(s.svc.MyContext)
+
+	if level <= 0 {
+		return bizerr.InvalidParameter
+	}
+
+	cfg, err := noble_m.GetConfigByLevel(model.Db, level)
+	if err != nil {
+		return err
+	}
+	if cfg.PurchasePrice <= 0 || cfg.RenewalPrice <= 0 {
+		return bizerr.InvalidParameter
+	}
+	n := noble_m.UserNoble{UserId: receiverUserId, Level: level}
+	records, err := n.FindAll(model.Db)
+	if err != nil {
+		return err
+	}
+	if len(records) > 1 {
+		// DB表结构决定了不可能发生
+		return bizerr.IncorrectState
+	}
+
+	if len(records) <= 0 {
+		// 新增贵族
+		endTime := time.Now().AddDate(0, 0, int(days))
+		n = noble_m.UserNoble{UserId: receiverUserId, Level: level, EndTime: endTime}
+		err = n.Create(model.Db)
+		if err != nil {
+			return err
+		}
+
+		nbl := noble_m.UserNobleLog{
+			SenderId:   0,
+			ReceiverId: receiverUserId,
+			Level:      level,
+			Money:      0,
+			SrcType:    noble_m.SRC_APP,
+			NewEndTime: endTime,
+		}
+		err = nbl.Create(model.Db)
+		if err != nil {
+			return err
+		}
+	} else {
+		// 延长贵族
+		n = records[0]
+		now := time.Now()
+		endTime := n.EndTime.AddDate(0, 0, int(days))
+		if now.After(n.EndTime) {
+			endTime = now.AddDate(0, 0, int(days))
+		}
+		nn := noble_m.UserNoble{
+			Entity: mysql.Entity{ID: n.ID, UpdatedTime: n.UpdatedTime},
+		}
+
+		af, err := nn.UpdateEndTime(model.Db, endTime)
+		if err != nil {
+			return err
+		}
+		if af <= 0 {
+			return bizerr.TransactionFailed
+		}
+
+		nbl := noble_m.UserNobleLog{
+			SenderId:   0,
+			ReceiverId: receiverUserId,
+			Level:      level,
+			Money:      0,
+			SrcType:    noble_m.SRC_APP,
+			OldEndTime: n.EndTime,
+			NewEndTime: endTime,
+		}
+		err = nbl.Create(model.Db)
+		if err != nil {
+			return err
+		}
+	}
+	// 头饰增加
+	receiveHeadwearDuration := uint32(days) * 3600 * 24
+	if cfg.HeaddressId != 0 {
+		userHeadwear, err := user_m.GetUserHeadwearOrInit(model, receiverUserId, cfg.HeaddressId)
+		if err != nil {
+			return err
+		}
+		nowTime := time.Now()
+		if userHeadwear.EndTime.After(nowTime) {
+			nowTime = userHeadwear.EndTime
+		}
+		userHeadwear.EndTime = nowTime.Add(time.Duration(receiveHeadwearDuration) * time.Second)
+		if err := userHeadwear.Persistent(); err != nil {
+			return err
+		}
+		//日志错误，并不事务回调
+		if _, err := addUserHeadwearLog(model, receiverUserId, cfg.HeaddressId, headwear_e.ActivityTrigger, headwear_e.AddSecond, &receiveHeadwearDuration, nil, 0); err != nil {
+			model.Log.Error(err)
+		}
+	}
+	// 增加座驾
+	receivePropertyDuration := uint32(days) * 3600 * 24
+	if cfg.RideId != 0 {
+		userProperty, err := user_m.GetUserPropertyOrInit(model, receiverUserId, cfg.RideId)
+		if err != nil {
+			return err
+		}
+		nowTime := time.Now()
+		if userProperty.EndTime.After(nowTime) {
+			nowTime = userProperty.EndTime
+		}
+		userProperty.EndTime = nowTime.Add(time.Duration(receivePropertyDuration) * time.Second)
+		if err := userProperty.Persistent(); err != nil {
+			return err
+		}
+		//日志错误，并不事务回调
+		if err := (&user_m.UserPropertyLog{
+			Model:         model,
+			UserId:        receiverUserId,
+			PropertyId:    cfg.RideId,
+			OriginType:    property_e.ActivityBillboardTrigger,
+			Type:          property_e.AddSecond,
+			AddSecond:     &receivePropertyDuration,
+			UpdateEndTime: nil,
+		}).Persistent(); err != nil {
+			model.Log.Error(err)
+		}
+	}
+	// 推送
+	user, err := user_m.GetUser(model, receiverUserId)
+	if err != nil {
+		return err
+	}
+	nobleDuration := days * 3600 * 24
+	if err := msg_m.NewUserRecord(model, user.ID, msg_e.AddNoble, user.Nick, user.ID, "", strconv.Itoa(int(nobleDuration)/(24*3600)), "", "", "").Persistent(); err != nil {
+		return err
+	}
+	msg_m.SendEmasMsgAssistant(model, user.ExternalId, user.DeviceType)
+	return nil
+}
+
+//增加修改日志
+func addUserHeadwearLog(model *domain.Model, userId mysql.ID, headwearId mysql.ID, originType headwear_e.UserHeadwearLogOrginType, t headwear_e.UserHeadwearLogType, addSecond *uint32, UpdateEndTime *time.Time, operateUserId mysql.ID) (mysql.ID, error) {
+	userHeadwearLog := user_m.UserHeadwearLog{
+		UserId:        userId,
+		OperateUserId: operateUserId,
+		HeadwearId:    headwearId,
+		OriginType:    originType,
+		Type:          t,
+		AddSecond:     addSecond,
+		UpdateEndTime: UpdateEndTime,
+	}
+	if err := model.Db.Create(&userHeadwearLog).Error; err != nil {
+		return 0, myerr.WrapErr(err)
+	}
+	return userHeadwearLog.ID, nil
+}

domain/service/ride_s/ride.go

+package ride_s
+
+import (
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"hilo-user/_const/enum/property_e"
+	"hilo-user/domain/model/user_m"
+	"hilo-user/domain/service"
+	"time"
+)
+
+type RideService struct {
+	svc *service.Service
+}
+
+func NewRideService(myContext *mycontext.MyContext) *RideService {
+	svc := service.CreateService(myContext)
+	return &RideService{svc}
+}
+
+// 下发座驾
+func (s *RideService) SendRide(receiverUserId mysql.ID, rideId mysql.ID, days int) error {
+	model := domain.CreateModelContext(s.svc.MyContext)
+	// 增加座驾
+	receivePropertyDuration := uint32(days) * 3600 * 24
+	userProperty, err := user_m.GetUserPropertyOrInit(model, receiverUserId, rideId)
+	if err != nil {
+		return err
+	}
+	nowTime := time.Now()
+	if userProperty.EndTime.After(nowTime) {
+		nowTime = userProperty.EndTime
+	}
+	userProperty.EndTime = nowTime.Add(time.Duration(receivePropertyDuration) * time.Second)
+	if err := userProperty.Persistent(); err != nil {
+		return err
+	}
+	//日志错误，并不事务回调
+	if err := (&user_m.UserPropertyLog{
+		Model:         model,
+		UserId:        receiverUserId,
+		PropertyId:    rideId,
+		OriginType:    property_e.ActivityBillboardTrigger,
+		Type:          property_e.AddSecond,
+		AddSecond:     &receivePropertyDuration,
+		UpdateEndTime: nil,
+	}).Persistent(); err != nil {
+		model.Log.Error(err)
+	}
+	return nil
+}

domain/service/service.go

 package service
 
 import (
-	"hilo-user/domain"
-	"hilo-user/mycontext"
-	"hilo-user/resource/mysql"
-	"hilo-user/resource/redisCli"
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"git.hilo.cn/hilo-common/resource/redisCli"
 	"runtime/debug"
 )
 

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1274 // indirect
 	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -53,6 +54,7 @@ require (
 	github.com/hashicorp/serf v0.9.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
 	github.com/jonboulle/clockwork v0.3.0 // indirect
 	github.com/json-iterator/go v1.1.9 // indirect
 	github.com/leodido/go-urn v1.2.0 // indirect

go.sum

@@ -8,6 +8,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1274 h1:u48e7I7h/BY5uDP8xiIFNaUkdTVk7hjj/Sucg8FrxNU=
+github.com/aliyun/alibaba-cloud-sdk-go v1.61.1274/go.mod h1:9CMdKNL3ynIGPpfTcdwTvIm8SGuAZYYC4jFVSSvE1YQ=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -67,6 +69,7 @@ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
@@ -77,6 +80,7 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCy
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/hashicorp/consul/api v1.7.0 h1:tGs8Oep67r8CcA2Ycmb/8BLBcJ70St44mF2X10a/qPg=
 github.com/hashicorp/consul/api v1.7.0/go.mod h1:1NSuaUUkFaJzMasbfq/11wKYWSR67Xn6r2DXKhuDNFg=
 github.com/hashicorp/consul/sdk v0.6.0 h1:FfhMEkwvQl57CildXJyGHnwGGM4HMODGyfjGwNM1Vdw=
@@ -119,6 +123,8 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
@@ -127,6 +133,7 @@ github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -198,12 +205,15 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
 github.com/swaggo/gin-swagger v1.2.0 h1:YskZXEiv51fjOMTsXrOetAjrMDfFaXD79PEoQBOe2W0=
 github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
@@ -267,6 +277,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -283,6 +294,7 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c=
 gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
@@ -291,6 +303,8 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.4.3 h1:/JhWJhO2v17d8hjApTltKNADm7K7YI2ogkR7avJUL3k=
 gorm.io/driver/mysql v1.4.3/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
 gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=

myerr/bizerr/bizCode.go

@@ -11,6 +11,8 @@ var (
 	CodeNoExist       = myerr.NewBusinessCode(1005, "code no exist", myerr.BusinessData{})
 	ParaMissing       = myerr.NewBusinessCode(1006, "parameter missing", myerr.BusinessData{})
 	InvalidParameter  = myerr.NewBusinessCode(1009, "Invalid parameter", myerr.BusinessData{})
+	IncorrectState    = myerr.NewBusinessCode(1013, "Incorrect state", myerr.BusinessData{})
+	TransactionFailed = myerr.NewBusinessCode(1014, "Transaction failed", myerr.BusinessData{})
 	ReqTooFrequent    = myerr.NewBusinessCode(1018, "Requests are too frequent", myerr.BusinessData{})
 
 	// 钻石

route/router.go

@@ -27,7 +27,14 @@ func InitRouter() *gin.Engine {
 	{
 		innerUser.GET("/levels", wrapper(user_r.MGetUserLevels))
 		innerUser.GET("/bag/id", wrapper(user_r.GetUserBagId))
-		//innerUser.POST("/bag/send", wrapper(user_r.SendUserBag))
+	}
+	// 道具相关
+	innerProp := inner.Group("/prop")
+	{
+		innerProp.POST("/bag/send", wrapper(user_r.SendUserBag))           // 下发背包道具,暂礼物
+		innerProp.POST("/noble/send", wrapper(user_r.SendUserNoble))       // 下发贵族
+		innerProp.POST("/headwear/send", wrapper(user_r.SendUserHeadwear)) // 下发头饰
+		innerProp.POST("/ride/send", wrapper(user_r.SendUserRide))         // 下发座驾
 	}
 	return r
 }

route/user_r/inner_prop.go

+package user_r
+
+import (
+	"errors"
+	"git.hilo.cn/hilo-common/domain"
+	"git.hilo.cn/hilo-common/mycontext"
+	"git.hilo.cn/hilo-common/resource/mysql"
+	"github.com/gin-gonic/gin"
+	"hilo-user/domain/model/bag_m"
+	"hilo-user/domain/service/headwear_s"
+	"hilo-user/domain/service/noble_s"
+	"hilo-user/domain/service/ride_s"
+	"hilo-user/resp"
+)
+
+type SendUserBagReq struct {
+	UserId  mysql.ID   `form:"userId" binding:"required"`
+	ResType mysql.Type `form:"resType" binding:"required"` // 道具类型 1:礼物道具
+	ResId   mysql.ID   `form:"resId" binding:"required"`   // 道具资源id
+	Count   mysql.Num  `form:"count" binding:"min=1"`      // 下发数量
+	Day     int        `form:"day" binding:"min=1"`        // 天数
+	Reason  string     `form:"reason" binding:"required"`  // 原因
+}
+
+// @Tags 用户-内部
+// @Summary 发送背包道具
+// @Param userId formData int true "用户id"
+// @Param resType formData int true "道具类型 1:礼物道具"
+// @Param resId formData int true "道具资源id"
+// @Param count formData int true "下发数量"
+// @Param day formData int true "天数"
+// @Param reason formData string true "原因"
+// @Success 200
+// @Router /inner/prop/bag/send [post]
+func SendUserBag(c *gin.Context) (*mycontext.MyContext, error) {
+	myCtx := mycontext.CreateMyContext(c.Keys)
+	var model = domain.CreateModelContext(myCtx)
+	var req SendUserBagReq
+	if err := c.ShouldBindQuery(&req); err != nil {
+		return myCtx, err
+	}
+	//var bagId mysql.ID
+	var err error
+	switch req.ResType {
+	case mysql.Type(1):
+		if _, err = bag_m.AddUserBag(model, req.UserId, req.ResType, req.ResId, req.Count, req.Day, req.Reason); err != nil {
+			return myCtx, err
+		}
+	default:
+		return myCtx, errors.New("un support type")
+	}
+	//userBag, err := bag_m.GetUserBag(model, bagId)
+	//if err != nil {
+	//	return myCtx, err
+	//}
+	resp.ResponseOk(c, struct{}{})
+	return myCtx, nil
+}
+
+type SendUserNobleReq struct {
+	UserId mysql.ID `form:"userId" binding:"required"`
+	Level  uint16   `form:"level" binding:"min=1,max=5"`
+	Day    int      `form:"day" binding:"min=1"`
+}
+
+// @Tags 用户-内部
+// @Summary 发送用户贵族
+// @Param userId formData int true "用户id"
+// @Param level formData int true "贵族等级"
+// @Param day formData int true "下发天数"
+// @Success 200
+// @Router /inner/prop/noble/send [post]
+func SendUserNoble(c *gin.Context) (*mycontext.MyContext, error) {
+	myCtx := mycontext.CreateMyContext(c.Keys)
+	var req SendUserNobleReq
+	if err := c.ShouldBindQuery(&req); err != nil {
+		return myCtx, err
+	}
+	if err := noble_s.NewNobleService(myCtx).SendNoble(req.UserId, req.Level, req.Day); err != nil {
+		return myCtx, err
+	}
+	resp.ResponseOk(c, struct{}{})
+	return myCtx, nil
+}
+
+type SendUserHeadwearReq struct {
+	UserId     mysql.ID `form:"userId" binding:"required"`
+	HeadwearId mysql.ID `form:"headwearId" binding:"required"`
+	Day        int      `form:"day" binding:"min=1"`
+}
+
+// @Tags 用户-内部
+// @Summary 发送用户头饰
+// @Param userId formData int true "用户id"
+// @Param headwearId formData int true "头饰id"
+// @Param day formData int true "天数"
+// @Success 200
+// @Router /inner/prop/headwear/send [post]
+func SendUserHeadwear(c *gin.Context) (*mycontext.MyContext, error) {
+	myCtx := mycontext.CreateMyContext(c.Keys)
+	var req SendUserHeadwearReq
+	if err := c.ShouldBindQuery(&req); err != nil {
+		return myCtx, err
+	}
+	if err := headwear_s.NewHeadwearService(myCtx).SendHeadwear(req.UserId, req.HeadwearId, req.Day); err != nil {
+		return myCtx, err
+	}
+	resp.ResponseOk(c, struct{}{})
+	return myCtx, nil
+}
+
+type SendUserRideReq struct {
+	UserId mysql.ID `form:"userId" binding:"required"`
+	RideId mysql.ID `form:"rideId" binding:"required"`
+	Day    int      `form:"day" binding:"min=1"`
+}
+
+// @Tags 用户-内部
+// @Summary 发送用户座驾
+// @Param userId formData int true "用户id"
+// @Param rideId formData int true "座驾id"
+// @Param day formData int true "天数"
+// @Success 200
+// @Router /inner/prop/ride/send [post]
+func SendUserRide(c *gin.Context) (*mycontext.MyContext, error) {
+	myCtx := mycontext.CreateMyContext(c.Keys)
+	var req SendUserRideReq
+	if err := c.ShouldBindQuery(&req); err != nil {
+		return myCtx, err
+	}
+	if err := ride_s.NewRideService(myCtx).SendRide(req.UserId, req.RideId, req.Day); err != nil {
+		return myCtx, err
+	}
+	resp.ResponseOk(c, struct{}{})
+	return myCtx, nil
+}