wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-lwl/withhh' into test

This commit is contained in:
lwl0608 2024-06-28 14:33:19 +08:00
parent e1d6fb9b15 bbc808e27a
commit 731f0f0db7
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/proto/vas/proto/vas.go
View File

@ -97,6 +97,7 @@ type WithdrawPageReq struct {
} }
type WithdrawPageData struct { type WithdrawPageData struct {
Diamonds int64 `json:"diamonds"`
WithdrawDiamonds int64 `json:"withdraw_diamonds"` // 可提现的钻石 WithdrawDiamonds int64 `json:"withdraw_diamonds"` // 可提现的钻石
Day7TotalDiamonds int64 `json:"day7_total_diamonds"` // 7天前0～24点总收益 Day7TotalDiamonds int64 `json:"day7_total_diamonds"` // 7天前0～24点总收益
Day7TotalWithdrawDiamonds int64 `json:"day7_total_withdraw_diamonds"` // 7天前0～24点已结算总收益 Day7TotalWithdrawDiamonds int64 `json:"day7_total_withdraw_diamonds"` // 7天前0～24点已结算总收益

6
app/mix/service/logic/vas.go
View File

@ -109,6 +109,11 @@ func (v *Vas) GetMembershipProductList(ctx *gin.Context, req *vasproto.GetMember
} }
func (v *Vas) CreateOrder(ctx *gin.Context, req *vasproto.CreateOrderReq) (data *vasproto.CreateOrderData, err error) { func (v *Vas) CreateOrder(ctx *gin.Context, req *vasproto.CreateOrderReq) (data *vasproto.CreateOrderData, err error) {
if req.Mid == 241685 {
err = fmt.Errorf("账号已受限，解限请联系客服")
return
}
// 检查退订单次数 // 检查退订单次数
var ( var (
et = time.Now().Unix() et = time.Now().Unix()
@ -1842,7 +1847,6 @@ func (v *Vas) WithdrawApply(ctx *gin.Context, req *vasproto.WithdrawApplyReq) (t
} }
// 2000元以下直接操作 // 2000元以下直接操作
//if money <= 200000 || vasproto.IsWithdrawAnyDiasEnable(req.Mid) {
alipayCli := alipaycli.GetAlipayClientByAppId(alipaycli.AppIdXinYiDaoLe) alipayCli := alipaycli.GetAlipayClientByAppId(alipaycli.AppIdXinYiDaoLe)
// 更改状态 // 更改状态

1
app/mix/service/vasservice.go
View File

@ -521,6 +521,7 @@ func (s *Service) WithdrawPage(ctx *gin.Context, req *vasproto.WithdrawPageReq)
data = new(vasproto.WithdrawPageData) data = new(vasproto.WithdrawPageData)
wallet, _ := _DefaultVas.CheckWalletExist(ctx, nil, req.Mid) wallet, _ := _DefaultVas.CheckWalletExist(ctx, nil, req.Mid)
if wallet != nil { if wallet != nil {
data.Diamonds = wallet.GetDiamonds()
data.WithdrawDiamonds = wallet.GetWithdrawDiamonds() data.WithdrawDiamonds = wallet.GetWithdrawDiamonds()
} }