Merge branch 'dev-lwl/withhh' into test

api/proto/vas/proto/vas.go

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

app/mix/service/logic/vas.go

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

app/mix/service/vasservice.go

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