guess

plugin/dapp/guess/commands/game.go

@@ -5,7 +5,6 @@
 package commands
 
 import (
-	"fmt"
 	jsonrpc "github.com/33cn/chain33/rpc/jsonclient"
 	rpctypes "github.com/33cn/chain33/rpc/types"
 	"github.com/33cn/chain33/types"
@@ -242,7 +241,6 @@ func guessQuery(cmd *cobra.Command, args []string) {
 	gameIDs, _ := cmd.Flags().GetString("gameIDs")
 	category, _ := cmd.Flags().GetString("category")
 
-	fmt.Println("ooo")
 	var params rpctypes.Query4Jrpc
 	params.Execer = pkt.GuessX
 

plugin/dapp/guess/executor/guessdb.go

@@ -442,7 +442,7 @@ func (action *Action) GameBet(pbBet *pkt.GuessGameBet) (*types.Receipt, error) {
 	}
 
 	prevStatus := game.Status
-	if game.Status != pkt.GuessGameStatusStart && game.Status != pkt.GuessGameStatusBet && game.Status != pkt.GuessGameStatusStopBet{
+	if game.Status != pkt.GuessGameStatusStart && game.Status != pkt.GuessGameStatusBet {
 		logger.Error("GameBet", "addr", action.fromaddr, "execaddr", action.execaddr, "Status error",
 			game.GetStatus())
 		return nil, pkt.ErrGuessStatus
@@ -767,6 +767,9 @@ func (action *Action) GameAbort(pbend *pkt.GuessGameAbort) (*types.Receipt, erro
 			continue
 		}
 
+		player.Bet.IsWinner = true
+		player.Bet.Profit = value
+
 		logs = append(logs, receipt.Logs...)
 		kv = append(kv, receipt.KV...)
 	}

plugin/dapp/guess/types/const.go

@@ -48,12 +48,12 @@ const (
 	//查询方法名
 	FuncName_QueryGamesByIds = "QueryGamesByIds"
 	FuncName_QueryGameById = "QueryGameById"
-	FuncName_QueryGameByAddr = "QueryGameByAddr"
-	FuncName_QueryGameByStatus = "QueryGameByStatus"
-	FuncName_QueryGameByAdminAddr = "QueryGameByAdminAddr"
-	FuncName_QueryGameByAddrStatus = "QueryGameByAddrStatus"
-	FuncName_QueryGameByAdminStatus = "QueryGameByAdminStatus"
-	FuncName_QueryGameByCategoryStatus="QueryGameByCategoryStatus"
+	FuncName_QueryGameByAddr = "QueryGamesByAddr"
+	FuncName_QueryGameByStatus = "QueryGamesByStatus"
+	FuncName_QueryGameByAdminAddr = "QueryGamesByAdminAddr"
+	FuncName_QueryGameByAddrStatus = "QueryGamesByAddrStatus"
+	FuncName_QueryGameByAdminStatus = "QueryGamesByAdminStatus"
+	FuncName_QueryGameByCategoryStatus="QueryGamesByCategoryStatus"
 )
 
 const (