Merge branch 'lixing' into dev

doc/api/transfercastile.api

@@ -46,5 +46,6 @@ type TransferCastileToGameListResp {
 type UserCastileBalanceResp {
 	TotalCastile   int `json:total_castile` //总数
 	TransferAmount int `json:transfer_amount` //已转回游戏内的数量
+	TotalBalance   int `json:total_balance` //castile当前余额
 }
 

internal/logic/transfercastile/get_castile_balance_logic.go

@@ -44,6 +44,7 @@ func (l *GetCastileBalanceLogic) GetCastileBalance() (resp *types.UserCastileBal
 	res := &types.UserCastileBalanceResp{
 		TotalCastile:   0,
 		TransferAmount: 0,
+		TotalBalance:   0,
 	}
 
 	cToken, err := l.svcCtx.CastileTokenModel.FindOneByEmail(l.ctx, u.Email)
@@ -57,5 +58,6 @@ func (l *GetCastileBalanceLogic) GetCastileBalance() (resp *types.UserCastileBal
 	return &types.UserCastileBalanceResp{
 		TotalCastile:   int(cToken.Total),
 		TransferAmount: int(cToken.Transfer),
+		TotalBalance:   int(cToken.Total) - int(cToken.Transfer),
 	}, nil
 }

internal/types/types.go

@@ -279,6 +279,7 @@ type UnlockChapterReq struct {
 type UserCastileBalanceResp struct {
 	TotalCastile   int `json:total_castile`   //总数
 	TransferAmount int `json:transfer_amount` //已转回游戏内的数量
+	TotalBalance   int `json:total_balance`   //castile当前余额
 }
 
 type UserNft struct {