司导下单

Mall.Model/Entity/Product/RB_Goods_Order.cs

@@ -308,17 +308,5 @@ namespace Mall.Model.Entity.Product
         /// 微店id
         /// </summary>
         public int? SmallShopsId { get; set; }
-        /// <summary>
-        /// 司导服务类型
-        /// </summary>
-        public GuideCarGoodsTypeEnum? CarType { get; set; }
-        /// <summary>
-        /// 司导预约开始时间
-        /// </summary>
-        public DateTime? TripSTime { get; set; }
-        /// <summary>
-        /// 司导预约结束时间
-        /// </summary>
-        public DateTime? TripETime { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -281,5 +281,50 @@ namespace Mall.Model.Entity.Product
         /// 手续费
         /// </summary>
         public decimal ServiceCharge { get; set; }
+
+        /// <summary>
+        /// 司导服务类型
+        /// </summary>
+        public GuideCarGoodsTypeEnum? CarType { get; set; }
+        /// <summary>
+        /// 司导预约开始时间
+        /// </summary>
+        public DateTime? TripSTime { get; set; }
+        /// <summary>
+        /// 司导预约结束时间
+        /// </summary>
+        public DateTime? TripETime { get; set; }
+        /// <summary>
+        /// 使用天数
+        /// </summary>
+        public decimal? UseDay { get; set; }
+        /// <summary>
+        /// 是否拼座  1是  2否
+        /// </summary>
+        public int? IsSpell { get; set; }
+        /// <summary>
+        /// 站点id
+        /// </summary>
+        public int? SiteId { get; set; }
+        /// <summary>
+        /// 导游id
+        /// </summary>
+        public int? GuideId { get; set; }
+        /// <summary>
+        /// 车辆id
+        /// </summary>
+        public int? CarId { get; set; }
+        /// <summary>
+        /// 车辆颜色id
+        /// </summary>
+        public int? CarColorId { get; set; }
+        /// <summary>
+        /// 车牌号
+        /// </summary>
+        public string CarNumber { get; set; }
+        /// <summary>
+        /// 线路名称
+        /// </summary>
+        public string LineName { get; set; }
     }
 }

Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs

@@ -19,6 +19,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public int? UserId { get; set; }
         /// <summary>
+        /// 商品乘坐人数
+        /// </summary>
+        public int? GoodsRideNum { get; set; }
+        /// <summary>
         /// 订单财务单据列表
         /// </summary>
         public List<RB_Finance_Extend> FinanceList { get; set; }

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -15,6 +15,18 @@ namespace Mall.Model.Extend.Product
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Goods_Order_Extend : RB_Goods_Order
     {
+        /// <summary>
+        /// 司导服务类型
+        /// </summary>
+        public GuideCarGoodsTypeEnum? CarType { get; set; }
+        /// <summary>
+        /// 司导预约开始时间
+        /// </summary>
+        public DateTime? TripSTime { get; set; }
+        /// <summary>
+        /// 司导预约结束时间
+        /// </summary>
+        public DateTime? TripETime { get; set; }
         /// <summary>
         /// 赠送的会员等级
         /// </summary>

Mall.Model/Extend/Product/RB_Goods_TargetDate_Extend.cs

@@ -27,5 +27,13 @@ namespace Mall.Model.Extend.Product
         /// 月份
         /// </summary>
         public string Month { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
     }
 }

Mall.Repository/Product/RB_Goods_TargetDateRepository.cs

@@ -34,6 +34,12 @@ namespace Mall.Repository.Product
             if (!string.IsNullOrEmpty(dmodel.DateTime)) {
                 where += $@" and {nameof(RB_Goods_TargetDate.Date)} ='{dmodel.DateTime}'";
             }
+            if (!string.IsNullOrEmpty(dmodel.StartTime)) {
+                where += $@" and {nameof(RB_Goods_TargetDate.Date)} >='{dmodel.StartTime}'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.EndTime)) {
+                where += $@" and {nameof(RB_Goods_TargetDate.Date)} <='{dmodel.EndTime} 23:59:59'";
+            }
             if (!string.IsNullOrEmpty(dmodel.Month))
             {
                 where += $@" and DATE_FORMAT(Date,'%Y-%m') ='{dmodel.Month}'";

Mall.WebApi/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
-    "UserConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "UserConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "UserConnectionPName": "MySql.Data.MySqlClient",
-    "PropertyConnection": "server=192.168.2.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "PropertyConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "PropertyConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {