From f885db9e204c172c62779f45c3edee3cae463b8d Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 01 四月 2025 16:00:33 +0800 Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3 --- LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs | 79 +++++++++++++++++++++++++++++++++++---- 1 files changed, 71 insertions(+), 8 deletions(-) diff --git a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs index 0979050..d2a2396 100644 --- a/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs +++ b/LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs @@ -11,16 +11,18 @@ AliPay = 20 } + + public enum LifePayOrderTypeEnum { [Description("璇濊垂璁㈠崟")] - 璇濊垂璁㈠崟 = 10, + PhoneOrder = 10, [Description("鐢佃垂璁㈠崟")] - 鐢佃垂璁㈠崟 = 20, + ElectricOrder = 20, [Description("鐕冩皵璁㈠崟")] - 鐕冩皵璁㈠崟 = 30, + GasOrder = 30, } public enum LifePayStatusEnum @@ -41,10 +43,35 @@ 閫�娆句腑 = 50, } +//public enum LifePayOrderStatusEnum +//{ +// [Description("鍏呭�间腑")] +// 寰呯‘璁� = 10, + +// [Description("宸插け璐�")] +// 宸插け璐� = 20, + +// [Description("宸插畬鎴�")] +// 宸插畬鎴� = 30, + +// [Description("閫�娆惧緟瀹℃牳")] +// 閫�娆惧緟瀹℃牳 = 40, + +// [Description("宸查��娆�")] +// 宸查��娆� = 50, + +// [Description("閫�娆惧け璐�")] +// 閫�娆惧け璐� = 60, + + +// [Description("閫�娆句腑")] +// 閫�娆句腑 = 70, +//} + public enum LifePayOrderStatusEnum { - [Description("寰呯‘璁�")] - 寰呯‘璁� = 10, + [Description("鍏呭�间腑")] + 鍏呭�间腑 = 10, [Description("宸插け璐�")] 宸插け璐� = 20, @@ -52,8 +79,8 @@ [Description("宸插畬鎴�")] 宸插畬鎴� = 30, - [Description("閫�娆惧緟瀹℃牳")] - 閫�娆惧緟瀹℃牳 = 40, + [Description("寰呴��娆�")] + 寰呴��娆� = 40, [Description("宸查��娆�")] 宸查��娆� = 50, @@ -64,6 +91,7 @@ [Description("閫�娆句腑")] 閫�娆句腑 = 70, + } public enum ACOOLYStatusEnum @@ -150,4 +178,39 @@ [Description("寰俊鐨勫唴瀹�")] 寰俊鐨勫唴瀹� = 4, -} \ No newline at end of file +} + +public enum LifePayRefundTypeEnum +{ + [Description("鍏ㄩ閫�娆�")] + 鍏ㄩ閫�娆� = 10, + + [Description("閮ㄥ垎閫�娆�")] + 閮ㄥ垎閫�娆� = 20 +} + +public enum ExpensesReceiptsTypeEnum +{ + [Description("鏀跺叆")] + Expenses = 10, + + [Description("鏀嚭")] + Receipts = 20, +} +public enum ConsumptionFrozenStatusEnum +{ + [Description("鍐荤粨")] + Frozen = 10, + + [Description("瑙e喕")] + Thaw = 20, +} + +public enum ConsumptionFlowEnum +{ + [Description("涓嶅彉")] + Unchanged = 10, + + [Description("鍑洪噾")] + Out = 20, +} -- Gitblit v1.9.1