Merge remote-tracking branch 'origin/master'

app/hdl/financial_center/hdl_withdraw.go

@@ -280,7 +280,7 @@ func GetWithdrawApplyList(c *gin.Context) {
 	UserIDs := make([]int64, len(*applies))
 	for _, apply := range *applies {
 		parentIDs = append(parentIDs, apply.ParentID)
-		UserIDs = append(UserIDs, apply.UserID)
+		UserIDs = append(UserIDs, apply.Uid)
 	}
 
 	// 查询上级
@@ -326,8 +326,8 @@ func GetWithdrawApplyList(c *gin.Context) {
 
 	for i, apply := range *applies {
 		list[i] = md.GetWithdrawApplyListNode{
-			WithdrawApplyId:  apply.WithdrawApplyId,
-			UserID:           apply.UserID,
+			WithdrawApplyId:  apply.Id,
+			UserID:           apply.Uid,
 			Nickname:         apply.Nickname,
 			ParentID:         apply.ParentID,
 			AliPayName:       apply.AliPayName,
@@ -338,14 +338,14 @@ func GetWithdrawApplyList(c *gin.Context) {
 			InviteCode:       apply.InviteCode,
 			Amount:           apply.Amount,
 			ActualReceipt:    apply.RealAmount,
-			SysFee:           apply.SysFee,
+			SysFee:           apply.Fee,
 			State:            apply.State,
-			ApplyAt:          apply.ApplyAt,
-			PayAt:            apply.PayAt,
+			ApplyAt:          apply.CreateAt,
+			PayAt:            apply.UpdateAt,
 			Memo:             apply.Memo,
 		}
-		if apply.Amount != "" && apply.SysFee != "" {
-			actualReceipt := utils.StrToFloat64(apply.Amount) - utils.StrToFloat64(apply.SysFee)
+		if apply.Amount != "" && apply.Fee != "" {
+			actualReceipt := utils.StrToFloat64(apply.Amount) - utils.StrToFloat64(apply.Fee)
 			list[i].ActualReceipt = utils.Float64ToStr(actualReceipt)
 		}
 		if apply.ParentID != 0 {
@@ -354,7 +354,7 @@ func GetWithdrawApplyList(c *gin.Context) {
 				list[i].ParentPhone = v.Phone
 			}
 		}
-		tagList, ok := recordsMap[apply.UserID]
+		tagList, ok := recordsMap[apply.Uid]
 		if ok {
 			list[i].Tag = tagList
 		}

app/md/financial_center/md_withdraw.go

@@ -1,6 +1,7 @@
 package md
 
 import (
+	"code.fnuoos.com/EggPlanet/egg_models.git/src/model"
 	"code.fnuoos.com/EggPlanet/egg_system_rules.git/rule/egg_energy/md"
 )
 
@@ -78,23 +79,15 @@ type WithdrawApplyAuditReq struct {
 }
 
 type WithdrawApplyInfo struct {
-	WithdrawApplyId int64  `xorm:"apply.id"`                 // 提现申请id
-	UserID          int64  `xorm:"usera.id"`                 // 会员 ID
-	Nickname        string `xorm:"usera.nickname"`           // 用户名称
-	ParentID        int64  `xorm:"parent_id"`                // 推荐人ID
-	AliPayName      string `xorm:"alipay.user_name"`         // 支付宝昵称
-	AliPayAccount   string `xorm:"alipay.user_id"`           // 支付宝账号
-	WxPayName       string `xorm:"wx.user_name"`             // 微信昵称
-	WxPayAccount    string `xorm:"wx.user_id"`               // 微信账号
-	WithdrawType    int    `xorm:"withdraw_kind"`            // 提现方式(1:支付宝 2:微信)
-	InviteCode      string `xorm:"usera.system_invite_code"` // 邀请码
-	Amount          string `xorm:"apply.amount"`             // 提现金额
-	RealAmount      string `xorm:"apply.real_amount"`        // 实际到账金额
-	SysFee          string `xorm:"apply.fee"`                // 手续费
-	State           int    `xorm:"apply.state"`              // 状态 0申请中,1通过,2完成,3失败,4处理中（队列）
-	ApplyAt         string `xorm:"apply.create_at"`          // 申请时间
-	PayAt           string `xorm:"apply.update_at"`          // 到账时间
-	Memo            string `xorm:"apply.memo"`               // 备注
+	model.FinWithdrawApply `xorm:"extends"`
+	Nickname               string `xorm:"usera.nickname"`           // 用户名称
+	ParentID               int64  `xorm:"parent_id"`                // 推荐人ID
+	AliPayName             string `xorm:"alipay.user_name"`         // 支付宝昵称
+	AliPayAccount          string `xorm:"alipay.user_id"`           // 支付宝账号
+	WxPayName              string `xorm:"wx.user_name"`             // 微信昵称
+	WxPayAccount           string `xorm:"wx.user_id"`               // 微信账号
+	WithdrawType           int    `xorm:"withdraw_kind"`            // 提现方式(1:支付宝 2:微信)
+	InviteCode             string `xorm:"usera.system_invite_code"` // 邀请码
 }
 
 type GetWithdrawApplyListResp struct {