feat: end

internal/api/mobile/pay/recookpay/query.go

@@ -1,11 +1,13 @@
 package recookpay
 
 import (
-	"github.com/gin-gonic/gin"
 	"recook/internal/back"
 	"recook/internal/dbc"
 	"recook/internal/model/user"
+	"recook/internal/v2/model/jyy"
 	"recook/tools"
+
+	"github.com/gin-gonic/gin"
 )
 
 type queryRecookPayParam struct {
@@ -26,9 +28,13 @@ func QueryFund(c *gin.Context) {
 		return
 	}
 
+	var wallet2 jyy.UserWallet
+	dbc.DB.First(&wallet2, "user_id = ?", p.UserID)
+
 	back.Suc(c, "", gin.H{
 		"id":               wallet.ID,
 		"amount":           wallet.Balance,
+		"balance":          wallet2.Deposit,
 		"unrecordedAmount": 0.0,
 		"havePassword":     len(wallet.Password) > 0,
 	})

internal/v2/logic/manage/jyy/withdrawal.go

@@ -28,11 +28,10 @@ func (o logic) WithdrawalList(args ArgsWithdrawal) (data []company.Apply, total
 	query := mysql.Db.Table((&company.Apply{}).TableName())
 	{
 		if args.Name != "" {
-			sub := mysql.Db.Model(&user.Information{}).Select("id").
+			sub := mysql.Db.Model(&user.RecookUserInfoModel{}).Select("id").
 				Where("nickname like ?", fmt.Sprintf("%%%s%%", args.Name))
 			query = query.Where("user_id in ?", sub)
 		}
-		if args.Sta
 		if args.Tax != 0 {
 			query = query.Where("tax = ?", args.Tax)
 		}