Merge remote-tracking branch 'origin/master'

rule/block_star_chain_settlement.go

@@ -40,7 +40,8 @@ func DailySettlementBlockStarChain(engine *xorm.Engine, mid string, isTask bool)
 	today := now.Format("2006-01-02")
 
 	fmt.Println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", now.Hour())
-	if isTask && (now.Hour() > 8 || now.Hour() < 1) {
+	//if isTask && (now.Hour() > 8 || now.Hour() < 1) {
+	if isTask && (now.Hour() > 8) {
 		//TODO::只在凌晨一点 ~ 凌晨 8 点运行
 		return errors.New("非运行时间")
 	}
@@ -546,6 +547,7 @@ func DealDestroyCoin(session *xorm.Session, kind int, amount float64, title stri
 	blockStarChainFlow.Direction = md.FlowDirectionExpenditure
 	blockStarChainFlow.Kind = kind
 	blockStarChainFlow.Title = title
+	blockStarChainFlow.Amount = zhios_order_relate_utils.Float64ToStrPrec10(amount)
 	blockStarChainFlow.CreateTime = now
 	switch kind {
 	case int(enum.SystemDestroy):