update 一个圈圈

md/block_star_chain.go

@@ -59,21 +59,21 @@ const (
 	NiuBeiCoinByReleaseOptionCoinNumTitleForUserVirtualCoinFlow               = "牛贝积分-释放期权积分"
 	NiuBeiCoinByReleaseOptionDestroyConsumeCoinNumTitleForUserVirtualCoinFlow = "释放期权积分数量-消耗消费积分数量"
 
-	OneCirclesGreenEnergySignInSettlementPersonalReward    = "签到个人奖励-可用绿色能量"
-	OneCirclesGreenEnergySignInSettlementTeamReward        = "签到团队奖励-结算绿色能量"
-	OneCirclesWatchAdRewardPersonalActiveCoin              = "观看激励视屏奖励-个人活跃积分"
-	OneCirclesWatchAdRewardTeamActiveCoin                  = "观看激励视屏奖励-团队活跃积分"
-	OneCirclesBalanceExchangeForGreenEnergy                = "余额兑换绿色能量"
-	OneCirclesGreenEnergyExchangeForBalance                = "绿色能量兑换余额"
-	OneCirclesPersonalActiveCoinExchangeGreenEnergy        = "个人活跃积分兑换可用绿色能量"
-	OneCirclesTeamActiveCoinExchangeGreenEnergy            = "团队活跃积分兑换结算绿色能量"
-	OneCirclesSettlementGreenEnergyExchangeGreenEnergy     = "结算绿色能量释放可用绿色能量"
+	OneCirclesGreenEnergySignInSettlementPersonalReward    = "签到奖励"
+	OneCirclesGreenEnergySignInSettlementTeamReward        = "团队加速奖励"
+	OneCirclesWatchAdRewardPersonalActiveCoin              = "浏览视频奖励"
+	OneCirclesWatchAdRewardTeamActiveCoin                  = "九维公排奖励"
+	OneCirclesBalanceExchangeForGreenEnergy                = "账户余额兑换"
+	OneCirclesGreenEnergyExchangeForBalance                = "兑换账户余额"
+	OneCirclesPersonalActiveCoinExchangeGreenEnergy        = "B活跃积分兑换"
+	OneCirclesTeamActiveCoinExchangeGreenEnergy            = "T活跃积分兑换"
+	OneCirclesSettlementGreenEnergyExchangeGreenEnergy     = "绿色能量释放"
 	OneCirclesWelfareOrdersExchangeGreenEnergy             = "福利订单兑换绿色能量"
 	OneCirclesConsumeOrdersExchangeGreenEnergy             = "消费订单兑换绿色能量"
-	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergy    = "个人活跃积分-兑换可用绿色能量"
-	OneCirclesTeamActiveCoinExchangeToBeGreenEnergy        = "团队活跃积分-结算绿色能量"
-	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergy = "结算绿色能量-释放可用绿色能量"
-	OneCirclesSettlementStarLevelDividends                 = "结算星级分红"
+	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergy    = "B兑换绿色能量"
+	OneCirclesTeamActiveCoinExchangeToBeGreenEnergy        = "T兑换绿色能量"
+	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergy = "绿色能量释放"
+	OneCirclesSettlementStarLevelDividends                 = "绿色能量分红"
 )
 
 const (
@@ -131,20 +131,20 @@ const (
 	NiuBeiCoinByExtendForUserVirtualCoinFlow                                         = 151 //直推奖励
 	NiuBeiCoinByTeamForUserVirtualCoinFlow                                           = 152 //团队奖励
 
-	OneCirclesGreenEnergySignInSettlementPersonalRewardForUserVirtualCoinFlow    = 155 //签到个人奖励-可用绿色能量
-	OneCirclesGreenEnergySignInSettlementTeamRewardForUserVirtualCoinFlow        = 156 //签到团队奖励-结算绿色能量
-	OneCirclesWatchAdRewardPersonalActiveCoinForUserVirtualCoinFlow              = 156 //观看激励视屏奖励-个人活跃积分
-	OneCirclesWatchAdRewardTeamActiveCoinForUserVirtualCoinFlow                  = 157 //观看激励视屏奖励-团队活跃积分
-	OneCirclesBalanceExchangeForGreenEnergyForUserVirtualCoinFlow                = 158 //余额兑换绿色能量
-	OneCirclesGreenEnergyExchangeForBalanceForUserVirtualCoinFlow                = 159 //绿色能量兑换余额
-	OneCirclesPersonalActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow        = 160 //个人活跃积分兑换可用绿色能量
-	OneCirclesTeamActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow            = 161 //团队活跃积分兑换结算绿色能量
-	OneCirclesSettlementGreenEnergyExchangeGreenEnergyForUserVirtualCoinFlow     = 162 //结算绿色能量释放可用绿色能量
+	OneCirclesGreenEnergySignInSettlementPersonalRewardForUserVirtualCoinFlow    = 155 //签到奖励
+	OneCirclesGreenEnergySignInSettlementTeamRewardForUserVirtualCoinFlow        = 156 //团队加速奖励
+	OneCirclesWatchAdRewardPersonalActiveCoinForUserVirtualCoinFlow              = 156 //浏览视频奖励
+	OneCirclesWatchAdRewardTeamActiveCoinForUserVirtualCoinFlow                  = 157 //九维公排奖励
+	OneCirclesBalanceExchangeForGreenEnergyForUserVirtualCoinFlow                = 158 //账户余额兑换
+	OneCirclesGreenEnergyExchangeForBalanceForUserVirtualCoinFlow                = 159 //兑换账户余额
+	OneCirclesPersonalActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow        = 160 //B活跃积分兑换
+	OneCirclesTeamActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow            = 161 //T活跃积分兑换
+	OneCirclesSettlementGreenEnergyExchangeGreenEnergyForUserVirtualCoinFlow     = 162 //绿色能量释放
 	OneCirclesWelfareOrdersExchangeGreenEnergyForUserVirtualCoinFlow             = 163 //福利订单兑换绿色能量
 	OneCirclesConsumeOrdersExchangeGreenEnergyForUserVirtualCoinFlow             = 164 //消费订单兑换绿色能量
-	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow    = 165 //个人活跃积分-兑换可用绿色能量
-	OneCirclesTeamActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow        = 166 //团队活跃积分-结算绿色能量
-	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergyForUserVirtualCoinFlow = 167 //结算绿色能量-释放可用绿色能量
+	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow    = 165 //B兑换绿色能量
+	OneCirclesTeamActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow        = 166 //T兑换绿色能量
+	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergyForUserVirtualCoinFlow = 167 //绿色能量释放
 	OneCirclesSettlementStarLevelDividendsForUserVirtualCoinFlow                 = 168 //结算星级冯弘-得到结算绿色能量
 
 )

md/fin_user_flow.go

@@ -15,8 +15,8 @@ const (
 	IntegralReleaseServiceRevenueRefundTitleForFinUserFlow = "订单退款-服务收益扣除"
 	ConsumeSubsidyTitleForFinUserFlow                      = "消费补贴-收益"
 	ExperienceSubsidyTitleForFinUserFlow                   = "体验补贴-收益"
-	GreenEnergyExchangeForBalanceTitleForFinUserFlow       = "绿色能量兑换余额"
-	BalanceExchangeForGreenEnergyTitleForFinUserFlow       = "余额兑换绿色能量"
+	GreenEnergyExchangeForBalanceTitleForFinUserFlow       = "兑换账户余额"
+	BalanceExchangeForGreenEnergyTitleForFinUserFlow       = "账户余额兑换"
 )
 
 const (
@@ -24,8 +24,8 @@ const (
 	IntegralReleaseServiceRevenueOrderRefundTypeForFinUserFlow = 51  // 积分释放-服务收益退款
 	ConsumeSubsidyOrdActionForFinUserFlow                      = 110 // 消费补贴-收益
 	ExperienceSubsidyOrdActionForFinUserFlow                   = 111 // 体验补贴-收益
-	GreenEnergyExchangeForBalanceForFinUserFlow                = 112 // 绿色能量兑换余额
-	BalanceExchangeForGreenEnergyForFinUserFlow                = 113 // 余额兑换绿色能量
+	GreenEnergyExchangeForBalanceForFinUserFlow                = 112 // 兑换账户余额
+	BalanceExchangeForGreenEnergyForFinUserFlow                = 113 // 账户余额兑换
 )
 
 const DealUserAmountRequestIdPrefix = "%s:deal_user_amount:%d"

rule/one_circles/enum/one_circles_available_green_energy_points_flow.go

@@ -26,11 +26,11 @@ func (kind OneCirclesAvailableGreenEnergyPointsFlowKind) String() string {
 	case AccountBalanceExchange:
 		return "账户余额兑换"
 	case GreenEnergyExchangeBalance:
-		return "绿色能量兑换余额"
+		return "兑换账户余额"
 	case TeamActivePointRedemption:
 		return "团队活跃积分兑换"
 	case SettlementStarLevelDividends:
-		return "结算星级分红"
+		return "绿色能量分红"
 	case MarketplaceMerchantNumsAutoExchangeMarketplaceMerchantFunds:
 		return "市商数量自动兑换市商资金"
 	case MarketplaceMerchantFundsAutoExchangeMarketplaceMerchantNums:

rule/one_circles/one_circles_deal_available_green_energy_points.go

@@ -181,7 +181,7 @@ func DealAvailableGreenEnergyCoin(session *xorm.Session, kind int, amount, amoun
 		oneCirclesAvailableGreenEnergyPointsFlow.BeforeMarketplaceMerchantFundValues = chain.MarketplaceMerchantFunds //市商资金
 		oneCirclesAvailableGreenEnergyPointsFlow.AfterMarketplaceMerchantFundValues = chain.MarketplaceMerchantFunds
 		break
-	case int(enum.GreenEnergyExchangeBalance): //绿色能量兑换余额
+	case int(enum.GreenEnergyExchangeBalance): //兑换账户余额
 		var destructionSetting *md2.DestructionSettingStruct
 		err := json.Unmarshal([]byte(chain.DestructionSetting), &destructionSetting)
 		if err != nil {

rule/one_circles/one_circles_star_level_dividends.go

@@ -19,7 +19,7 @@ import (
 
 const SettlementStarLevelDividendsLockKey = "settlement_star_level_dividends_lock_key"
 
-// SettlementStarLevelDividends 结算星级分红
+// SettlementStarLevelDividends 绿色能量分红
 func SettlementStarLevelDividends(engine *xorm.Engine, masterId string) (err error) {
 	now := time.Now()
 	fmt.Println(now.Hour())