Merge remote-tracking branch 'origin/master'

md/block_star_chain.go

@@ -77,6 +77,7 @@ const (
 )
 
 const DealUserCoinRequestIdPrefix = "%s:block_star_chain_deal_user_coin:%d:uid:%d"
+const DealUserCoinForGreenRequestIdPrefix = "%s:block_star_chain_deal_user_coin_for_green:%d:uid:%d"
 
 const RewardBaseMultiple = 10           //区块星链-打赏倍数
 const RewardBaseMultipleForMerchant = 2 //区块星链-打赏倍数(商家)

rule/block_green_chain_settlement.go

@@ -554,7 +554,7 @@ func DealUserCoinForGreen(session *xorm.Session, req md.DealUserCoinReq) (err er
 		req.Amount = 0
 	}
 	//1、分布式锁阻拦
-	requestIdPrefix := fmt.Sprintf(md.DealUserCoinRequestIdPrefix, req.Mid, req.CoinId, req.Uid)
+	requestIdPrefix := fmt.Sprintf(md.DealUserCoinForGreenRequestIdPrefix, req.Mid, req.CoinId, req.Uid)
 	cb, err := svc.HandleDistributedLock(req.Mid, strconv.Itoa(req.Uid), requestIdPrefix)
 	if err != nil {
 		return err