From c573732636815e569d24aacff11a82f93602585a Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期三, 11 十二月 2024 09:10:43 +0800
Subject: [PATCH] 完成配送订单处理
---
CoreCms.Net.Configuration/GlobalEnumVars.cs | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index ea958e7..e09fb55 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -72,6 +72,8 @@
鏈嶅姟璁㈠崟缂栧彿 = 10,
[Description("鏈嶅姟鍒稿厬鎹㈢爜")]
鏈嶅姟鍒稿厬鎹㈢爜 = 11,
+ [Description("璁″垝璁㈠崟缂栧彿")]
+ 璁″垝璁㈠崟缂栧彿 = 12,
}
/// <summary>
/// 鏉ユ簮
@@ -204,9 +206,9 @@
[Description("鎻愮幇")]
Tocash = 4,
/// <summary>
- /// 涓夌骇鍒嗛攢浣ｉ噾
+ /// 鍒嗛攢浣ｉ噾
/// </summary>
- [Description("涓夌骇鍒嗛攢浣ｉ噾")]
+ [Description("鍒嗛攢浣ｉ噾")]
Distribution = 5,
/// <summary>
/// 骞冲彴璋冩暣
@@ -233,6 +235,25 @@
/// </summary>
[Description("鏃ュ巻绛惧埌")]
CheckIn = 10,
+
+ /// <summary>
+ /// 缁忛攢鍟嗕笟缁╂彁鎴�
+ /// </summary>
+ [Description("缁忛攢鍟嗕笟缁╂彁鎴�")]
+ DistributionAchievement = 11,
+
+ /// <summary>
+ /// 璁㈠崟
+ /// </summary>
+ [Description("璁㈠崟")]
+ GoodsOder = 12,
+
+
+ /// <summary>
+ /// 缁忛攢閰嶉�佷剑閲�
+ /// </summary>
+ [Description("缁忛攢閰嶉�佷剑閲�")]
+ DistributionDelivery = 13,
}
/// <summary>
/// 鐢ㄦ埛绉垎鍙樺姩鏉ユ簮绫诲瀷
@@ -647,6 +668,18 @@
TransactionComponent = 10,
}
+
+ /// <summary>
+ /// 璁″垝璁㈠崟鏄惁鎻愪氦
+ /// </summary>
+ public enum PlanOrderTiJiao
+ {
+ [Description("鏈攣鍗�")]
+ 鏈攣鍗� = 1,
+ [Description("宸查攣鍗�")]
+ 宸查攣鍗� = 2
+ }
+
/// <summary>
/// 鍙戣揣鍗曠姸鎬�
/// </summary>
@@ -812,7 +845,12 @@
/// 闂ㄥ簵鑷彁
/// </summary>
[Description("<button type='button' class='layui-btn layui-btn-warm layui-btn-xs'>闂ㄥ簵鑷彁</button>")]
- SelfDelivery = 3
+ SelfDelivery = 3,
+ /// <summary>
+ /// 缁忛攢鍟嗛厤閫�
+ /// </summary>
+ [Description("<button type='button' class='layui-btn layui-btn-warm layui-btn-xs'>缁忛攢鍟嗛厤閫�</button>")]
+ DistributorDelivery = 4
}
#endregion
@@ -999,7 +1037,12 @@
/// 浣欓鏀粯
/// </summary>
[Description("浣欓鏀粯")]
- balancepay = 4
+ balancepay = 4,
+ /// <summary>
+ /// 璁″垝璁㈠崟鏀粯
+ /// </summary>
+ [Description("璁″垝璁㈠崟鏀粯")]
+ planorderpay = 5
}
#endregion
@@ -2294,7 +2337,7 @@
#region 鍒嗛攢璁剧疆
/// <summary>
- /// 鍒嗛攢鍟嗙敵璇峰鏍哥姸鎬�
+ /// 缁忛攢鍟嗙敵璇峰鏍哥姸鎬�
/// </summary>
public enum DistributionVerifyStatus
{
@@ -2313,9 +2356,15 @@
/// </summary>
[Description("瀹℃牳鎷掔粷")]
VerifyRefuse = 3,
+
+ /// <summary>
+ /// 瀹℃牳鎷掔粷
+ /// </summary>
+ [Description("鍙栨秷璧勬牸")]
+ VerifyCancel = 4,
}
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
+ /// 缁忛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
/// </summary>
public enum DistributionOrderSettlementStatus
@@ -2431,7 +2480,7 @@
}
/// <summary>
- /// 鎴愪负鍒嗛攢鍟嗘潯浠�
+ /// 鎴愪负缁忛攢鍟嗘潯浠�
/// </summary>
public enum DistributionConditionType
{
@@ -2828,6 +2877,12 @@
/// </summary>
[Description("閫�璐�")]
ReturnedGoods = 5,
+
+ /// <summary>
+ /// 閾鸿揣鐩樼偣
+ /// </summary>
+ [Description("閾鸿揣鐩樼偣")]
+ CheckPuhuo = 6,
}
#endregion
--
Gitblit v1.9.1