Merge remote-tracking branch 'origin/master'

internal/model/do/users.go

@@ -29,4 +29,5 @@ type Users struct {
 	RoleId           interface{} // 角色ID
 	LastLoginStoreId interface{} // 上次登录门店ID
 	Quan8Uuid        interface{} // 8圈使用的 uuid
+	XyUserId         interface{} // 系统唯一用户ID
 }

internal/model/entity/users.go

@@ -27,4 +27,5 @@ type Users struct {
 	RoleId           int64       `json:"roleId"           orm:"role_id"             description:"角色ID"`       // 角色ID
 	LastLoginStoreId int64       `json:"lastLoginStoreId" orm:"last_login_store_id" description:"上次登录门店ID"`   // 上次登录门店ID
 	Quan8Uuid        string      `json:"quan8Uuid"        orm:"quan8_uuid"          description:"8圈使用的 uuid"` // 8圈使用的 uuid
+	XyUserId         string      `json:"xyUserId"         orm:"xy_user_id"          description:"系统唯一用户ID"`   // 系统唯一用户ID
 }

internal/model/reward.go

@@ -196,19 +196,21 @@ type CallbackData struct {
 }
 
 type GetRewardIn struct {
-	Id           int
-	AreaId       int
-	GameId       int
-	GameCode     string
-	RewradTypeId int
-	RewardId     int
-	RoleIdx      string
-	TaskId       string
-	PopenId      string
-	Source       int
-	BindType     int
-	UserTaskId   int
-	UserId       int
+	Id            int
+	AreaId        int
+	GameId        int
+	GameCode      string
+	RewradTypeId  int
+	RewardId      int
+	RoleIdx       string
+	TaskId        string
+	PopenId       string
+	Source        int
+	BindType      int
+	UserTaskId    int
+	UserId        int
+	GrantQuantity int
+	StoreId       int
 }
 type GetRewardOut struct {
 	//List []GetRewardNewOut `json:"list"`

internal/model/userTaskReward.go

@@ -44,3 +44,9 @@ type UserClaimReward struct {
 	RewardName   string       `json:"rewardName" orm:"reward_name"`
 	SimpleReward SimpleReward `json:"reward" orm:"with:id=reward_id"`
 }
+type NetfeeCallbackIn struct {
+	OrderId string
+}
+type NetfeeCallbackOut struct {
+	Success bool
+}