Merge branch 'HK' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -358,5 +358,10 @@ namespace Mall.Model.Extend.Product
         /// 服务人员姓名
         /// </summary>
         public string ServicepersonalName { get; set; }
+
+        /// <summary>
+        /// 订单商品所属门店
+        /// </summary>
+        public int StoresIds { get; set; }
     }
 }

Mall.Repository/Product/RB_Goods_OrderDetailRepository.cs

@@ -650,7 +650,11 @@ where {where}  order by o.CreateDate desc";
                 where += $@" and o.{nameof(RB_Goods_Order.UserId)} ={dmodel.UserId}";
             }
 
-            string sql = $@"SELECT a.*,e.`Name` as CarName,e.CarType as GuideCarType,e.CarClass,f.ColorName as CarColorName,cb.`Name` as CarBrandName,g.RideNum,gcg.Name as GuideName,gcg.GuidePhoto,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone FROM rb_goods_orderdetail as a 
+            string sql = $@"
+SELECT a.*,e.`Name` as CarName,e.CarType as GuideCarType,e.CarClass,f.ColorName as CarColorName,cb.`Name` as CarBrandName,g.RideNum
+      ,gcg.Name as GuideName,gcg.GuidePhoto,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone
+      ,g.StoresIds
+FROM rb_goods_orderdetail as a 
 left join rb_goods_order o on a.OrderId = o.OrderId
 LEFT JOIN rb_guidecar_car as e on e.ID=a.CarId
 LEFT JOIN rb_guidecar_carbrand as cb on e.CarBrandId=cb.ID

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -119,6 +119,9 @@ namespace Mall.WebApi.Controllers.MallBase
             //小程序
             var mall = new object();
 
+            //线下服务小程序配置接口
+            var offlineServiceSetting = new object();
+
             //直播海报配置
             var liveConfig = new object();
 
@@ -129,11 +132,12 @@ namespace Mall.WebApi.Controllers.MallBase
                 miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true, isGetNav: 1);
                 //基础配置
                 setting = MallHelper.GetBasicSetting(miniProgram);
-
                 //分销基础信息
                 share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
                 //分销商设置
                 share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
+                //线下服务配置
+                offlineServiceSetting = MallHelper.GetOfflineServiceConfig(miniProgram);
             }
 
             #region 首页页面数据解析
@@ -390,6 +394,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 expired_at = "0000-00-00 00:00:00",
                 option = new List<object>(),
                 setting,
+                offlineServiceSetting,
             };
 
             #region 授权页面热区

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -8,6 +8,7 @@ using Mall.Model.Extend.User;
 using Mall.Module.BaseSetUp;
 using Mall.Module.MarketingCenter;
 using Mall.Module.Product;
+using Mall.Module.Reserve;
 using Mall.Module.User;
 using Mall.Repository.Product;
 using Mall.Repository.User;
@@ -82,6 +83,11 @@ namespace Mall.WebApi.Controllers
         /// </summary>
         private static Module.Education.EducationModule educationModule = new Module.Education.EducationModule();
 
+        /// <summary>
+        /// 线下服务配置处理类
+        /// </summary>
+        private static ReserveModule reserveModule = new ReserveModule();
+
 
         /// <summary>
         /// 解析插件数据为对象
@@ -2631,6 +2637,22 @@ namespace Mall.WebApi.Controllers
             #endregion
             return share_setting_custom;
         }
+
+        /// <summary>
+        /// 获取线下服务小程序配置
+        /// </summary>
+        /// <param name="miniProgram"></param>
+        /// <returns></returns>
+        public static object GetOfflineServiceConfig(RB_MiniProgram_Extend miniProgram)
+        {
+            var model = reserveModule.GetReserveBaseInfo(Convert.ToInt32(miniProgram.TenantId), miniProgram.MallBaseId);
+            var obj = new
+            {
+                offlineServicePayType = model?.PayTypeList,
+                offlineServiceOrderStateList = model?.OrderStateList
+            };
+            return obj;
+        }
     }
 
     /// <summary>

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1283,7 +1283,12 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.CarColorName,
                 x.CarBrandName,
                 x.GuideName,
-                x.GuidePhoto
+                x.GuidePhoto,
+                x.ServiceDate,
+                x.ServiceTime,
+                x.ServicepersonalId,
+                x.ServicepersonalName,
+                x.StoresIds,
             });
             return ApiResult.Success("", pagelist);
         }