update 一个圈圈

md/fin_user_flow.go

@@ -22,6 +22,8 @@ const (
 	IntegralReleaseServiceRevenueOrderRefundTypeForFinUserFlow = 51  // 积分释放-服务收益退款
 	ConsumeSubsidyOrdActionForFinUserFlow                      = 110 // 消费补贴-收益
 	ExperienceSubsidyOrdActionForFinUserFlow                   = 111 // 体验补贴-收益
+	GreenEnergyExchangeForBalanceForFinUserFlow                = 112 // 绿色能量兑换余额
+	BalanceExchangeForGreenEnergyForFinUserFlow                = 113 // 余额兑换绿色能量
 )
 
 const DealUserAmountRequestIdPrefix = "%s:deal_user_amount:%d"

rule/one_circles/one_circles_available_green_energy_settlement.go

@@ -67,7 +67,7 @@ func CalcPriceReductionFormula(engine *xorm.Engine, userExchangeNumsValue string
 	greenEnergyValues := userExchangeNums.Mul(afterPrice)                                     //绿色能量个数
 	greenEnergyFeeValues := greenEnergyValues.Mul(exchangeAccountBalanceFee.Div(decimalRate)) //绿色能量个数扣除手续费
 
-	values = greenEnergyValues.Sub(greenEnergyFeeValues).Truncate(8).String() //用户得到绿色能量个数
+	values = greenEnergyValues.Sub(greenEnergyFeeValues).Truncate(8).String() //扣除用户绿色能量个数
 	greenEnergy = greenEnergyValues.Truncate(8).String()
 	greenEnergyFee = greenEnergyFeeValues.Truncate(8).String()
 	nowPriceValue = nowPrice.String()