Add Bank Card for Withdrawal

app/main/api/internal/logic/agent/getwithdrawallistlogic.go

@@ -81,18 +81,31 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
 			remark = withdrawal.Remark.String
 		}
 
-		list = append(list, types.WithdrawalItem{
-			Id:           withdrawal.Id,
-			WithdrawalNo: withdrawal.WithdrawNo,
-			Amount:       withdrawal.Amount,
-			TaxAmount:    withdrawal.TaxAmount,
-			ActualAmount: withdrawal.ActualAmount,
-			Status:       withdrawal.Status,
-			PayeeAccount: withdrawal.PayeeAccount,
-			PayeeName:    withdrawal.PayeeName,
-			Remark:       remark,
-			CreateTime:   withdrawal.CreateTime.Format("2006-01-02 15:04:05"),
-		})
+		item := types.WithdrawalItem{
+			Id:             withdrawal.Id,
+			WithdrawalNo:   withdrawal.WithdrawNo,
+			WithdrawalType: withdrawal.WithdrawalType,
+			Amount:         withdrawal.Amount,
+			TaxAmount:      withdrawal.TaxAmount,
+			ActualAmount:   withdrawal.ActualAmount,
+			Status:         withdrawal.Status,
+			PayeeAccount:   withdrawal.PayeeAccount,
+			PayeeName:      withdrawal.PayeeName,
+			Remark:         remark,
+			CreateTime:     withdrawal.CreateTime.Format("2006-01-02 15:04:05"),
+		}
+
+		// 如果是银行卡提现，填充银行卡信息
+		if withdrawal.WithdrawalType == 2 {
+			if withdrawal.BankCardNo.Valid {
+				item.BankCardNo = withdrawal.BankCardNo.String
+			}
+			if withdrawal.BankName.Valid {
+				item.BankName = withdrawal.BankName.String
+			}
+		}
+
+		list = append(list, item)
 	}
 
 	return &types.GetWithdrawalListResp{