页面修改

Mall.Module.Product/OrderModule.cs

@@ -12576,11 +12576,19 @@ namespace Mall.Module.Product
                 {
                     QIds = servicePersions
                 });
+                List<RB_Reserve_MemberCoupon_Extend> educationCouponList = new List<RB_Reserve_MemberCoupon_Extend>();
+                // 查询订单详情对应的套餐卡信息
+                string educationCouponIds = string.Join(",", dlist.Where(x => x.EducationCouponId > 0).Select(x => x.EducationCouponId).Distinct());
+                if (!string.IsNullOrWhiteSpace(educationCouponIds))
+                {
+                    educationCouponList = reserveMemberCouponRepository.GetList(new RB_Reserve_MemberCoupon_Extend { TenantId = tenantId, MallBaseId = mallBaseId, Ids = educationCouponIds });
+                }
                 foreach (var item in dlist)
                 {
                     item.CoverImagePath = item.CoverImage;
                     item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2;
                     item.ServicepersonalName = serviceList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
+                    item.ReserveCouponList = educationCouponList.Where(x => x.Id == item.EducationCouponId).ToList();// 2020-10-11 订单详情对应的套餐卡
                 }
             }
             model.DetailList = dlist;
@@ -12738,6 +12746,7 @@ namespace Mall.Module.Product
                 model.PreferPrice,
                 model.Income,
                 model.FreightMoney,
+                EducationMoney=(model?.EducationMoney??0),
                 CouponMoney = model.CouponMoney ?? 0,
                 IntegralMoney = (model.DetailList != null && model.DetailList.Any()) ? (model.DetailList.Sum(x => x.IntegralMoney ?? 0)) : 0,
                 IntegralNumber = (model.DetailList != null && model.DetailList.Any()) ? (model.DetailList.Sum(x => x.IntegralNumber ?? 0)) : 0,
@@ -12843,6 +12852,12 @@ namespace Mall.Module.Product
                     x.ServiceTime,
                     x.ServiceDate,
                     x.ServicepersonalName,
+                    MemberEducationCouponList = x?.ReserveCouponList.Select(z => new
+                    {
+                        z.Name,
+                        z.UseHeXiao,
+                        z.HeXiao
+                    }),
                 }),
             });
         }