From 18a4451e5b7bf8f7f6a260796acb24adb3b2ccda Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 14 十月 2024 15:34:28 +0800
Subject: [PATCH] 修正提现逻辑，实现重新建单支付 API
---
cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs b/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
index 697153d..bec1437 100644
--- a/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
+++ b/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
@@ -1,5 +1,6 @@
锘縰sing cylsg.Core;
using cylsg.Core.Attributes;
+using cylsg.Model.UserModel;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -33,22 +34,30 @@
/// <summary>
/// 鑾峰彇鎴栬缃井淇℃壒娆″崟鍙枫��
/// </summary>
- [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃井淇℃壒娆″崟鍙�")]
- public string BatchId { get; set; }
+ [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃井淇℃壒娆″崟鍙�",IsNullable =true)]
+ public string? BatchId { get; set; }
/// <summary>
/// 鑾峰彇鎴栬缃壒娆＄姸鎬併��
/// </summary>
- [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃壒娆＄姸鎬�")]
+ [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃壒娆＄姸鎬�",IsNullable =true)]
public string? BatchStatus { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛ID銆�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐢ㄦ埛ID")]
+ public int UserID { get; set; }
-
-
+ /// <summary>
+ /// 鐢ㄦ埛琛ㄦ儏銆�
+ /// </summary>
+ [Navigate(NavigateType.OneToOne, nameof(UserID))]
+ public User user { get; set; }
/// <summary>
/// 鑾峰彇鎴栬缃壒娆＄殑鍚嶇О銆�
@@ -130,15 +139,47 @@
/// </summary>
[SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃浆璐﹀満鏅爣璇嗙", IsNullable = true)]
public string? TransferSceneId { get; set; }
-
+ /// <summary>
+ /// 閿欒娑堟伅
+ /// </summary>
+ [SugarColumn(ColumnDescription = "閿欒娑堟伅", IsNullable = true)]
+ public string? ErrorMsg { get; set; }
-
-
- /// <summary>
- /// 鑾峰彇鎴栬缃壒娆′腑鐨勮缁嗚浆璐﹀垪琛ㄣ��
- /// </summary>
- [Navigate(NavigateType.OneToMany,nameof(WeChatTransferItem.WeChatTransferOrderID))]
+ /// <summary>
+ /// 閿欒鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnDescription = "閿欒鏍囪瘑", IsNullable = true)]
+ public string? ErrorCode { get; set; }
+ /// <summary>
+ /// 鑾峰彇鎴栬缃壒娆′腑鐨勮缁嗚浆璐﹀垪琛ㄣ��
+ /// </summary>
+ [Navigate(NavigateType.OneToMany,nameof(WeChatTransferItem.WeChatTransferOrderID))]
public List<WeChatTransferItem> TransferDetailList { get; set; }
+
+ /// <summary>
+ /// 鍐嶆鍙戣捣鏃� 鐨勬弿杩�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍏朵粬鎻忚堪", IsNullable = true)]
+ public string? RemakeDes { get; set; }
+ /// <summary>
+ /// 鏄惁閲嶆柊鍙戣捣鏀粯锛屽綋鏀粯澶辫触鍚庯紝瓒呭嚭閲嶆柊鐨勬敮浠樺崟澶辫触鍚庯紝闇�瑕侀噸鏂版洿鎹㈠崟鍙烽噸鏂板彂璧锋柊鐨勬敮浠樿姹傦紝閲嶆柊鍙戣捣鏀粯璇锋眰鍗�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏄噸鏂板彂璧风殑鏀粯璁㈠崟", IsNullable = true)]
+ public int? WeChatTransferOrderPrId { get; set; }
+
+
+ /// <summary>
+ /// 閲嶆柊鏀粯璁㈠崟鍒楄〃
+ /// </summary>
+ [Navigate(NavigateType.OneToMany, nameof(WeChatTransferOrderPrId))]
+ public List<WeChatTransferOrder>? AgWeChatTransferOrders { get; set; }
+
+ /// <summary>
+ /// 鏄惁宸茬粡瀹屾垚澶勭悊 榛樿鏈鐞�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鏄惁宸茬粡瀹屾垚澶勭悊", DefaultValue ="0")]
+ public bool IsSetOK { get; set; }= false;
+
}
@@ -146,6 +187,7 @@
/// 杞处鍗曞垪琛�
/// </summary>
[SugarTable(TableDescription = "杞处鍗曡处璇︾粏鍒楄〃妯″瀷")]
+ [CoderFirst]
public class WeChatTransferItem:BaseModel
{
/// <summary>
--
Gitblit v1.9.1