订单列表修改

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1857,7 +1857,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.OrderClassify = 3;
             var list = orderModule.GetOfflineServiceOrderPageListModule(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
-            pagelist.pageData = list.Select(x => new
+            var obj = list.Select(x => new
             {
                 x.OrderId,
                 x.OrderNo,
@@ -1886,9 +1886,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.DiscountsPrice
                 }),
                 DetailList = x.DetailList.Select(y => new
-                {
-                    y.SupplierId,
-                    y.SupplierName,
+                {        
                     y.FreightCostMoney,
                     y.FreightMoney,
                     y.CostMoney,
@@ -1898,12 +1896,9 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.OrderType,
                     OrderTypeName = y.OrderType.GetEnumName(),
                     y.GoodsName,
-                    SpecificationList = y.TeacherList.Select(x => x.Name),
                     y.ProductCode,
                     y.Final_Price,
                     y.Number,
-                    y.IsBindExpress,
-                    y.FreeShippingRemarks,
                     y.SmallShopsCostPrice,
                     y.YSMoney,
                     y.RealMoney,
@@ -1912,12 +1907,6 @@ namespace Mall.WebApi.Controllers.MallBase
                     CouponMoney = y.CouponMoney ?? 0,
                     InsuranceMoney = y.InsuranceMoney ?? 0,
                     InsuranceCostMoney = y.InsuranceCostMoney ?? 0,
-                    IntegralMoney = y.IntegralMoney ?? 0,
-                    IntegralNumber = y.IntegralNumber ?? 0,
-                    MemberEducationCouponList = y.MemberEducationCouponList.Select(z => new
-                    {
-                        z.Name,
-                    }),
                     SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new
                     {
                         z.FrID,
@@ -1929,7 +1918,11 @@ namespace Mall.WebApi.Controllers.MallBase
                         z.FrID,
                         z.Status,
                         z.Is_Cashier
-                    })
+                    }),
+                    y.ServiceDate,
+                    y.ServiceTime,
+                    y.GoodServiceTime,
+                    y.ServicepersonalName
                 }),
                 x.Consignee,
                 x.Mobile,
@@ -1951,8 +1944,11 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.MallBaseId,
                 x.SmallShopsId,
                 x.SmallShopsName,
-                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.StoreName,
+                x.StoresAddress,
             });
+            pagelist.pageData = obj;
             return ApiResult.Success("", pagelist);
         }
         #endregion

Mall.WebApi/Controllers/Reserve/OSGoodsController.cs

@@ -707,14 +707,27 @@ namespace Mall.WebApi.Controllers.Reserve
             return ApiResult.Success("", pagelist);
         }
 
-
         /// <summary>
-        /// 获取订单信息
+        /// 获取我的订单详情
         /// </summary>
         /// <returns></returns>
+        [HttpPost]
         public ApiResult GetOfflineOrderInfo()
         {
-            return ApiResult.Failed();
+            var req = RequestParm;
+            var userInfo = AppletUserInfo;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            //HK2020-08-08新增
+            if (parms.GetInt("NewUserId") > 0)
+            {
+                userInfo.UserId = parms.GetInt("NewUserId");
+            }
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            return orderModule.GetOfflineMyOrderModule(OrderId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
         }
     }
 }