From a7f9af876286e21e2be7a6c3e1f42f6e539134fc Mon Sep 17 00:00:00 2001
From: "DESKTOP-BP1469S\\1" <1058783880@qq.com>
Date: Wed, 27 Apr 2022 10:53:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=BB=93=E6=9E=84=E5=88=86?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnumAccountType.cs}                       |  4 +-
 .../EnumCouponUseType.cs}                     |  4 +-
 .../Appreciation/IntegralEnum.cs              | 41 +++++++++++++++++
 .../EnumCommonStatus.cs}                      | 10 ++---
 .../EnumDataScopeType.cs}                     |  4 +-
 .../EnumSRDUserType.cs}                       |  7 +--
 src/BPA.Common.Eums/IntegralEnum.cs           | 44 -------------------
 .../EnumMenuOpenType.cs}                      |  4 +-
 .../{MenuType.cs => Menu/EnumMenuType.cs}     |  4 +-
 src/BPA.Common.Eums/Order/OrderEnum.cs        | 18 ++++++++
 src/BPA.Common.Eums/OrderEnum.cs              | 21 ---------
 .../{OrgType.cs => Org/EnumOrgType.cs}        |  4 +-
 12 files changed, 80 insertions(+), 85 deletions(-)
 rename src/BPA.Common.Eums/{AccountType.cs => Account/EnumAccountType.cs} (87%)
 rename src/BPA.Common.Eums/{CouponUseType.cs => Appreciation/EnumCouponUseType.cs} (82%)
 create mode 100644 src/BPA.Common.Eums/Appreciation/IntegralEnum.cs
 rename src/BPA.Common.Eums/{CommonStatus.cs => Common/EnumCommonStatus.cs} (90%)
 rename src/BPA.Common.Eums/{DataScopeType.cs => Common/EnumDataScopeType.cs} (92%)
 rename src/BPA.Common.Eums/{SRDUserType.cs => Common/EnumSRDUserType.cs} (87%)
 delete mode 100644 src/BPA.Common.Eums/IntegralEnum.cs
 rename src/BPA.Common.Eums/{MenuOpenType.cs => Menu/EnumMenuOpenType.cs} (89%)
 rename src/BPA.Common.Eums/{MenuType.cs => Menu/EnumMenuType.cs} (86%)
 create mode 100644 src/BPA.Common.Eums/Order/OrderEnum.cs
 delete mode 100644 src/BPA.Common.Eums/OrderEnum.cs
 rename src/BPA.Common.Eums/{OrgType.cs => Org/EnumOrgType.cs} (91%)

diff --git a/src/BPA.Common.Eums/AccountType.cs b/src/BPA.Common.Eums/Account/EnumAccountType.cs
similarity index 87%
rename from src/BPA.Common.Eums/AccountType.cs
rename to src/BPA.Common.Eums/Account/EnumAccountType.cs
index be75468..41b4248 100644
--- a/src/BPA.Common.Eums/AccountType.cs
+++ b/src/BPA.Common.Eums/Account/EnumAccountType.cs
@@ -5,12 +5,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Account
 {
     /// <summary>
     /// 分账账户类型
     /// </summary>
-    public enum AccountType
+    public enum EnumAccountType
     {
         /// <summary>
         /// 商户
diff --git a/src/BPA.Common.Eums/CouponUseType.cs b/src/BPA.Common.Eums/Appreciation/EnumCouponUseType.cs
similarity index 82%
rename from src/BPA.Common.Eums/CouponUseType.cs
rename to src/BPA.Common.Eums/Appreciation/EnumCouponUseType.cs
index de8e7fb..570468c 100644
--- a/src/BPA.Common.Eums/CouponUseType.cs
+++ b/src/BPA.Common.Eums/Appreciation/EnumCouponUseType.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Appreciation.Coupon
 {
-    public enum CouponUseType
+    public enum EnumCouponUseType
     {
         [Description("未使用")]
         NoUse=1,
diff --git a/src/BPA.Common.Eums/Appreciation/IntegralEnum.cs b/src/BPA.Common.Eums/Appreciation/IntegralEnum.cs
new file mode 100644
index 0000000..b94ec41
--- /dev/null
+++ b/src/BPA.Common.Eums/Appreciation/IntegralEnum.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.Common.Eums.Appreciation.Integ
+{
+    public enum EnumCalculateType
+    {
+        积分方案 = 1,
+        多倍积分 = 2,
+        独立计算 = 3
+    }
+
+    /// <summary>
+    /// 积分增加/减少类型
+    /// </summary>
+    public enum EnumIntegSourceType
+    {
+
+        订单消费 = 1,
+        活动赠送 = 2,
+        后台补充 = 3,
+        积分兑换 = 4,
+    }
+
+    /// <summary>
+    /// 小类方案类型
+    /// </summary>
+    public enum EnumallTypes
+    {
+        common = 0,
+        price = 1,
+        big = 2,
+        small = 3,
+        count = 4,
+        persons = 5,
+        number = 6
+    }
+}
diff --git a/src/BPA.Common.Eums/CommonStatus.cs b/src/BPA.Common.Eums/Common/EnumCommonStatus.cs
similarity index 90%
rename from src/BPA.Common.Eums/CommonStatus.cs
rename to src/BPA.Common.Eums/Common/EnumCommonStatus.cs
index a0bf87e..535d0d1 100644
--- a/src/BPA.Common.Eums/CommonStatus.cs
+++ b/src/BPA.Common.Eums/Common/EnumCommonStatus.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Common
 {
     /// <summary>
     /// 公共状态
     /// </summary>
-    public enum CommonStatus
+    public enum EnumCommonStatus
     {
         /// <summary>
         /// 正常
@@ -25,7 +25,7 @@ namespace BPA.Common.Eums
         [Description("删除")]
         DELETED = 2
     }
-    public enum MenuTypeEnums
+    public enum EnumMenuTypeEnums
     {
         /// <summary>
         ///  数据操作类型
@@ -39,7 +39,7 @@ namespace BPA.Common.Eums
     /// <summary>
     /// 账号类型
     /// </summary>
-    public enum AdminEnums
+    public enum EnumAdminEnums
     {
         /// <summary>
         /// 超级管理员
@@ -62,7 +62,7 @@ namespace BPA.Common.Eums
     /// <summary>
     /// 会员平台
     /// </summary>
-    public enum PlatformType
+    public enum EnumPlatformType
     {
         /// <summary>
         /// 默认
diff --git a/src/BPA.Common.Eums/DataScopeType.cs b/src/BPA.Common.Eums/Common/EnumDataScopeType.cs
similarity index 92%
rename from src/BPA.Common.Eums/DataScopeType.cs
rename to src/BPA.Common.Eums/Common/EnumDataScopeType.cs
index f337475..c458d66 100644
--- a/src/BPA.Common.Eums/DataScopeType.cs
+++ b/src/BPA.Common.Eums/Common/EnumDataScopeType.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Common
 {
-    public enum DataScopeType
+    public enum EnumDataScopeType
     {
         /// <summary>
         /// 全部数据
diff --git a/src/BPA.Common.Eums/SRDUserType.cs b/src/BPA.Common.Eums/Common/EnumSRDUserType.cs
similarity index 87%
rename from src/BPA.Common.Eums/SRDUserType.cs
rename to src/BPA.Common.Eums/Common/EnumSRDUserType.cs
index 15e4d60..7f193af 100644
--- a/src/BPA.Common.Eums/SRDUserType.cs
+++ b/src/BPA.Common.Eums/Common/EnumSRDUserType.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Common
 {
-    public enum SRDUserType
+    public enum EnumSRDUserType
     {
         /// <summary>
         /// 人员
@@ -22,7 +22,8 @@ namespace BPA.Common.Eums
         USERTYPE = 1,
 
     }
-    public enum RSDGroupType
+
+    public enum EnumRSDGroupType
     {
         /// <summary>
         /// 设备
diff --git a/src/BPA.Common.Eums/IntegralEnum.cs b/src/BPA.Common.Eums/IntegralEnum.cs
deleted file mode 100644
index 9dfb68d..0000000
--- a/src/BPA.Common.Eums/IntegralEnum.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPA.Common.Eums
-{
-    public class IntegralEnum
-    {
-        public enum CalculateType
-        {
-            积分方案 = 1,
-            多倍积分 = 2,
-            独立计算 = 3
-        }
-
-        /// <summary>
-        /// 积分增加/减少类型
-        /// </summary>
-        public enum IntegSourceType
-        {
-
-            订单消费 = 1,
-            活动赠送 = 2,
-            后台补充 = 3,
-            积分兑换 = 4,
-        }
-
-        /// <summary>
-        /// 小类方案类型
-        /// </summary>
-        public enum allTypes
-        {
-            common = 0,
-            price = 1,
-            big = 2,
-            small = 3,
-            count = 4,
-            persons = 5,
-            number = 6
-        }
-    }
-}
diff --git a/src/BPA.Common.Eums/MenuOpenType.cs b/src/BPA.Common.Eums/Menu/EnumMenuOpenType.cs
similarity index 89%
rename from src/BPA.Common.Eums/MenuOpenType.cs
rename to src/BPA.Common.Eums/Menu/EnumMenuOpenType.cs
index 84d5555..f4005b1 100644
--- a/src/BPA.Common.Eums/MenuOpenType.cs
+++ b/src/BPA.Common.Eums/Menu/EnumMenuOpenType.cs
@@ -1,11 +1,11 @@
 using System.ComponentModel;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Menu
 {
     /// <summary>
     /// 系统菜单类型
     /// </summary>
-    public enum MenuOpenType
+    public enum EnumMenuOpenType
     {
         /// <summary>
         /// 无
diff --git a/src/BPA.Common.Eums/MenuType.cs b/src/BPA.Common.Eums/Menu/EnumMenuType.cs
similarity index 86%
rename from src/BPA.Common.Eums/MenuType.cs
rename to src/BPA.Common.Eums/Menu/EnumMenuType.cs
index 66385cf..3236796 100644
--- a/src/BPA.Common.Eums/MenuType.cs
+++ b/src/BPA.Common.Eums/Menu/EnumMenuType.cs
@@ -1,8 +1,8 @@
 using System.ComponentModel;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Menu
 {
-    public enum MenuType
+    public enum EnumMenuType
     {
         /// <summary>
         /// 目录
diff --git a/src/BPA.Common.Eums/Order/OrderEnum.cs b/src/BPA.Common.Eums/Order/OrderEnum.cs
new file mode 100644
index 0000000..e717d5c
--- /dev/null
+++ b/src/BPA.Common.Eums/Order/OrderEnum.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.Common.Eums.Order
+{
+    public enum EnumSubOrderCookingStutas
+    {
+        WaitMake = 0,
+        Making = 1,
+        WaitTake = 2,
+        TakeCompleted = 3,
+        Normal = 99998,
+        Error = 99999
+    }
+}
diff --git a/src/BPA.Common.Eums/OrderEnum.cs b/src/BPA.Common.Eums/OrderEnum.cs
deleted file mode 100644
index fdceb12..0000000
--- a/src/BPA.Common.Eums/OrderEnum.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPA.Common.Eums
-{
-    public class OrderEnum
-    {
-        public enum SubOrderCookingStutas
-        {
-            WaitMake = 0,
-            Making = 1,
-            WaitTake = 2,
-            TakeCompleted = 3,
-            Normal = 99998,
-            Error = 99999
-        }
-    }
-}
diff --git a/src/BPA.Common.Eums/OrgType.cs b/src/BPA.Common.Eums/Org/EnumOrgType.cs
similarity index 91%
rename from src/BPA.Common.Eums/OrgType.cs
rename to src/BPA.Common.Eums/Org/EnumOrgType.cs
index 952499b..1b60fa6 100644
--- a/src/BPA.Common.Eums/OrgType.cs
+++ b/src/BPA.Common.Eums/Org/EnumOrgType.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPA.Common.Eums
+namespace BPA.Common.Eums.Org
 {
-    public enum OrgType
+    public enum EnumOrgType
     {
         /// <summary>
         /// 机构部门