11

gx_api/GxPress/Model/GxPress.Entity/Order/Order.cs

@@ -0,0 +1,72 @@
+using Datory.Annotations;
+
+namespace GxPress.Entity.Order
+{
+    /// <summary>
+    /// 会员
+    /// </summary>
+    [DataTable("tede_order")]
+    public class Order : Datory.Entity
+    {
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string OrderNumber { get; set; }
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int UserId { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Name { get; set; }
+        /// <summary>
+        /// 交易流水
+        /// </summary>
+        /// <value></value>
+
+        [DataColumn]
+        public string BillNumber { get; set; }
+        /// <summary>
+        /// 说明
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public string Explain { get; set; }
+        /// <summary>
+        /// 交易价格
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+
+        public decimal Price { get; set; }
+        /// <summary>
+        /// 是否交易
+        /// </summary>
+        /// <value></value>
+
+        [DataColumn]
+        public bool IsSuccess { get; set; }
+
+        /// <summary>
+        /// 是否退款
+        /// </summary>
+        /// <value></value>
+
+        [DataColumn]
+        public bool IsRefund { get; set; }
+
+        /// <summary>
+        /// 支付方式 1 微信 2 支付宝
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int PayWay { get; set; }
+    }
+}

gx_api/GxPress/Model/GxPress.Entity/User.cs

@@ -142,5 +142,35 @@ namespace GxPress.Entity
         /// <value></value>
         [DataColumn]
         public string OpenId { get; set; }
+         /// <summary>
+        /// 会员类型 月卡 季卡 年卡
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 终端 pc android ios
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int Port { get; set; }
+        /// <summary>
+        /// 会员开始时间
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public DateTime BeginTime { get; set; }
+        /// <summary>
+        /// 会员结束时间
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public DateTime EndTime { get; set; }
+        /// <summary>
+        /// 累计价格
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public decimal AccumulativePrice { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Vip/Vip.cs

@@ -45,12 +45,13 @@ namespace GxPress.Entity.Vip
         /// <value></value>
         [DataColumn]
         public decimal Price { get; set; }
+
         /// <summary>
-        /// 是否禁用
+        /// 支付方式 1 微信 2 支付宝
         /// </summary>
         /// <value></value>
         [DataColumn]
-        public bool IsDisable { get; set; }
+        public int PayWay { get; set; }
 
     }
 }

gx_api/GxPress/Model/GxPress.EnumConst/VipTypeConst.cs

@@ -1,5 +1,8 @@
 namespace GxPress.EnumConst
 {
+    /// <summary>
+    /// 会员类型
+    /// </summary>
     public enum VipCardTypeConst
     {
         //月卡
@@ -9,14 +12,25 @@ namespace GxPress.EnumConst
         //年卡
         Year = 3
     }
+    /// <summary>
+    /// 终端
+    /// </summary>
     public enum VipPortTypeConst
     {
-        //月卡
+        //客户端
         Pc = 1,
-        //季卡
+        //Android手机
         Android = 2,
-        //年卡
+        //苹果手机
         Ios = 3
     }
+    /// <summary>
+    /// 支付方式
+    /// </summary>
+    public enum PayWayTypeConst
+    {
+        WeChat = 1,
+        AliyPay = 2
+    }
 
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Order/OrderRepository.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using AutoMapper;
+using Datory;
+using GxPress.Common.AppOptions;
+using GxPress.Common.Tools;
+using GxPress.Repository.Interface.Order;
+using Microsoft.Extensions.Options;
+
+namespace GxPress.Repository.Implement.Order
+{
+    public class OrderRepository : IOrderRepository
+    {
+        private readonly Repository<Entity.Order.Order> _repository;
+
+        private readonly IMapper _mapper;
+        public OrderRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper)
+        {
+            var databaseType = StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
+            var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
+            _repository = new Repository<Entity.Order.Order>(database);
+            _mapper = mapper;
+        }
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Interface/Order/IOrderRepository.cs

@@ -0,0 +1,9 @@
+using Datory;
+
+namespace GxPress.Repository.Interface.Order
+{
+    public interface IOrderRepository: IRepository
+    {
+         
+    }
+}