页面修改

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Entity.Product;
 using Mall.Model.Extend.Finance;
+using Mall.Model.Extend.Reserve;
 
 namespace Mall.Model.Extend.Product
 {
@@ -36,6 +37,12 @@ namespace Mall.Model.Extend.Product
         /// 课程卡信息  //2020-10-11 Add By:w
         /// </summary>
         public List<Education.RB_Education_MemberCoupon_Extend> MemberEducationCouponList { get; set; }
+
+        /// <summary>
+        /// 套餐卡信息
+        /// </summary>
+        public List<RB_Reserve_MemberCoupon_Extend> ReserveCouponList { get; set; }
+
         /// <summary>
         /// 是否直播订单
         /// </summary>

Mall.Module.Product/OrderModule.cs

@@ -325,6 +325,11 @@ namespace Mall.Module.Product
         /// </summary>
         private Mall.Repository.Education.RB_Education_MemberCouponRepository educationMemberCouponRepository = new Mall.Repository.Education.RB_Education_MemberCouponRepository();
 
+        /// <summary>
+        /// 套餐卡仓储层对象
+        /// </summary>
+        private RB_Reserve_MemberCouponRepository reserveMemberCouponRepository = new RB_Reserve_MemberCouponRepository();
+
         /// <summary>
         /// 服务人员仓储层对象
         /// </summary>
@@ -8534,12 +8539,20 @@ namespace Mall.Module.Product
                     {
                         QIds = persionIds
                     });
+                    //查询订单详情对应的课程卡信息
+                    string educationCouponIds = string.Join(",", dlist.Where(x => x.EducationCouponId > 0).Select(x => x.EducationCouponId).Distinct());
+                    List<RB_Reserve_MemberCoupon_Extend> educationCouponList = new List<RB_Reserve_MemberCoupon_Extend>();
+                    if (!string.IsNullOrWhiteSpace(educationCouponIds))
+                    {
+                        educationCouponList = reserveMemberCouponRepository.GetList(new RB_Reserve_MemberCoupon_Extend { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, Ids = educationCouponIds });
+                    }
                     foreach (var item in dlist)
                     {
                         item.CoverImagePath = item.CoverImage;
                         item.GoodsSubName = GList.Where(x => x.Id == item.GoodsId).FirstOrDefault()?.SubName ?? "";
                         item.FinanceList = flist.Where(x => x.ECOrderDetailId == item.Id).ToList();// 2020-08-19 新增财务单据列表
                         item.ServicepersonalName = persionList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
+                        item.ReserveCouponList = educationCouponList.Where(x => x.Id == item.EducationCouponId).ToList();// 2020-10-11 订单详情对应的课程卡
                     }
                 }
                 //2020-08-25 Add By:W Start

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1909,6 +1909,10 @@ namespace Mall.WebApi.Controllers.MallBase
                     CouponMoney = y.CouponMoney ?? 0,
                     InsuranceMoney = y.InsuranceMoney ?? 0,
                     InsuranceCostMoney = y.InsuranceCostMoney ?? 0,
+                    MemberEducationCouponList = y.ReserveCouponList.Select(z => new
+                    {
+                        z.Name,
+                    }),
                     SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new
                     {
                         z.FrID,