提交代码

Mall.Common/Enum/Goods/OrderListExportEnum.cs

@@ -311,4 +311,109 @@ namespace Mall.Common.Enum.Goods
         [EnumField("备注/表单")]
         BZBD = 27
     }
+
+
+    /// <summary>
+    /// 教育订单列表导出选项枚举
+    /// </summary>
+    public enum OrderListExportForEducationEnum
+    {
+        /// <summary>
+        /// 所属平台
+        /// </summary>
+        [EnumField("所属平台")]
+        SSPT = 1,
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        [EnumField("订单号")]
+        DDH = 2,
+        /// <summary>
+        /// 商户单号
+        /// </summary>
+        [EnumField("商户单号")]
+        SHDH = 3,
+        /// <summary>
+        /// 下单用户
+        /// </summary>
+        [EnumField("下单用户")]
+        XDYH = 4,
+        /// <summary>
+        /// 商品名
+        /// </summary>
+        [EnumField("商品名")]
+        SPM = 5,
+        /// <summary>
+        /// 副标题
+        /// </summary>
+        [EnumField("副标题")]
+        FBT = 28,
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [EnumField("人数")]
+        SL = 7,
+        /// <summary>
+        /// 成本价
+        /// </summary>
+        [EnumField("成本价")]
+        CBJ = 9,
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        [EnumField("总金额")]
+        ZJE = 10,
+        /// <summary>
+        /// 实际付款
+        /// </summary>
+        [EnumField("实际付款")]
+        SJFK = 11,
+      
+        /// <summary>
+        /// 下单时间
+        /// </summary>
+        [EnumField("下单时间")]
+        XDSJ = 12,
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        [EnumField("支付方式")]
+        ZFFS = 13,
+        /// <summary>
+        /// 订单状态
+        /// </summary>
+        [EnumField("订单状态")]
+        DDZT = 14,
+        /// <summary>
+        /// 付款状态
+        /// </summary>
+        [EnumField("付款状态")]
+        FKZT = 15,
+        /// <summary>
+        /// 付款时间
+        /// </summary>
+        [EnumField("付款时间")]
+        FKSJ = 16,
+        /// <summary>
+        /// 老师
+        /// </summary>
+        [EnumField("老师")]
+        Teacher = 17,
+
+        /// <summary>
+        /// 卖家留言
+        /// </summary>
+        [EnumField("卖家留言")]
+        MJLY = 18,
+        /// <summary>
+        /// 商家备注
+        /// </summary>
+        [EnumField("商家备注")]
+        SJBZ = 19,
+        /// <summary>
+        /// 备注/表单
+        /// </summary>
+        [EnumField("备注/表单")]
+        BZBD = 20
+    }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -26,6 +26,16 @@ namespace Mall.Model.Extend.Product
         /// 订单财务单据列表
         /// </summary>
         public List<RB_Finance_Extend> FinanceList { get; set; }
+
+        /// <summary>
+        /// 教师列表
+        /// </summary>
+        public List<RB_Goods_WK_Teacher_Extend> TeacherList { get; set; }
+
+        /// <summary>
+        /// 课程卡信息  //2020-10-11 Add By:w
+        /// </summary>
+        public List<Education.RB_Education_MemberCoupon_Extend> MemberEducationCouponList { get; set; }
         /// <summary>
         /// 是否直播订单
         /// </summary>

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -137,6 +137,9 @@ namespace Mall.Model.Extend.Product
         /// 优惠券信息  //2020-08-25 Add By:w
         /// </summary>
         public List<User.RB_Member_DiscountCoupon_Extend> MemberDiscountCouponList { get; set; }
+
+
+        
         /// <summary>
         /// 是否发放佣金   1是  2否
         /// </summary>