Merge remote-tracking branch 'origin/master'

enum/user_virtual_amount_flow.go

@@ -22,6 +22,10 @@ const (
 	EggEnergyRecruitNewUsersReward
 	EggEnergyMaliciousAccountFlashingDeductionPersonal
 	EggEnergyMaliciousAccountFlashingDeductionTeam
+	EggEnergyMaliciousAccountFlashingDeductionRecoverPersonal
+	EggEnergyMaliciousAccountFlashingDeductionRecoverTeam
+	EggEnergyMaliciousAccountFlashingDeductionRestorePersonal
+	EggEnergyToAccountBalanceExchangeEggEnergy
 )
 
 func (kind UserVirtualAmountFlowTransferType) String() string {
@@ -62,7 +66,14 @@ func (kind UserVirtualAmountFlowTransferType) String() string {
 		return "恶意账户刷机个人蛋蛋能量扣除"
 	case EggEnergyMaliciousAccountFlashingDeductionTeam:
 		return "恶意账户刷机团队蛋蛋能量扣除"
-
+	case EggEnergyMaliciousAccountFlashingDeductionRecoverPersonal:
+		return "恶意账户刷机个人蛋蛋能量还原"
+	case EggEnergyMaliciousAccountFlashingDeductionRecoverTeam:
+		return "恶意账户刷机团队蛋蛋能量还原"
+	case EggEnergyMaliciousAccountFlashingDeductionRestorePersonal:
+		return "恶意账户刷机个人蛋蛋能量恢复"
+	case EggEnergyToAccountBalanceExchangeEggEnergy:
+		return "余额兑换个人蛋蛋能量"
 	default:
 		return "未知状态"
 	}

rule/egg_energy/md/mq_egg_app.go

@@ -12,6 +12,8 @@ const (
 	EggRoutKeyForSendFriendCircle                       = "egg_send_friend_circle"                      // 发送朋友圈
 	EggRoutKeyForComment                                = "egg_comment"                                 // 评论
 	EggRoutKeyForPunishmentRecord                       = "egg_publish"                                 // 处罚冻结用户上级
+	EggRoutKeyForRecoverRecord                          = "egg_recover"                                 // 返还冻结用户上级金额
+	EggRoutKeyForRestoreRecord                          = "egg_restore"                                 // 恢复返还冻结用户上级金额
 )
 
 type EggNewUserRegisterData struct {
@@ -85,3 +87,11 @@ type EggRoutKeyForPunishmentRecordData struct {
 	Uid    int64  `json:"uid"`
 	Amount string `json:"amount"`
 }
+
+type EggRoutKeyForRecoverRecordData struct {
+	Uid int64 `json:"uid"`
+}
+
+type EggRoutKeyForRestoreRecordData struct {
+	Uid int64 `json:"uid"`
+}