Merge remote-tracking branch 'origin/master'

md/block_star_chain.go

@@ -68,8 +68,8 @@ const (
 	OneCirclesPersonalActiveCoinExchangeGreenEnergy        = "B活跃积分兑换"
 	OneCirclesTeamActiveCoinExchangeGreenEnergy            = "T活跃积分兑换"
 	OneCirclesSettlementGreenEnergyExchangeGreenEnergy     = "绿色能量释放"
-	OneCirclesWelfareOrdersExchangeGreenEnergy             = "福利订单兑换"
-	OneCirclesConsumeOrdersExchangeGreenEnergy             = "消费订单兑换"
+	OneCirclesConsumeOrdersGiveGreenEnergyForPerson        = "消费订单赠送" //(奖励个人活跃积分)
+	OneCirclesConsumeOrdersGiveGreenEnergyForTeam          = "消费订单赠送" //(奖励九纬活跃积分)
 	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergy    = "B兑换绿色能量"
 	OneCirclesTeamActiveCoinExchangeToBeGreenEnergy        = "T兑换绿色能量"
 	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergy = "绿色能量释放"
@@ -143,8 +143,8 @@ const (
 	OneCirclesPersonalActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow        = 161 //B活跃积分兑换
 	OneCirclesTeamActiveCoinExchangeGreenEnergyForUserVirtualCoinFlow            = 162 //T活跃积分兑换
 	OneCirclesSettlementGreenEnergyExchangeGreenEnergyForUserVirtualCoinFlow     = 163 //绿色能量释放
-	OneCirclesWelfareOrdersExchangeGreenEnergyForUserVirtualCoinFlow             = 164 //福利订单兑换
-	OneCirclesConsumeOrdersExchangeGreenEnergyForUserVirtualCoinFlow             = 165 //消费订单兑换
+	OneCirclesConsumeOrdersGiveGreenEnergyToPersonForUserVirtualCoinFlow         = 164 //消费订单赠送(奖励个人活跃积分)
+	OneCirclesConsumeOrdersGiveGreenEnergyToTeamForUserVirtualCoinFlow           = 165 //消费订单赠送(奖励九纬活跃积分)
 	OneCirclesPersonalActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow    = 166 //B兑换绿色能量
 	OneCirclesTeamActiveCoinExchangeToBeGreenEnergyForUserVirtualCoinFlow        = 167 //T兑换绿色能量
 	OneCirclesSettlementGreenEnergyExchangeTobeGreenEnergyForUserVirtualCoinFlow = 168 //绿色能量释放