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

Mall.Model/Entity/Product/RB_Goods_Order.cs

@@ -312,5 +312,9 @@ namespace Mall.Model.Entity.Product
         /// 订单分类  0正常订单  1司导订单
         /// </summary>
         public int OrderClassify { get; set; }
+        /// <summary>
+        /// 目的地（司导订单）
+        /// </summary>
+        public string DestinationAddress { get; set; }
     }
 }

Mall.ThirdCore/Commom/Config.cs

@@ -74,7 +74,7 @@ namespace Mall.ThirdCore.Commom
         {
             try
             {
-                string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ConfigValue.json");
+                string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "appsettings.json");
 
                 //读取json文件  
                 using (StreamReader sr = new StreamReader(path))

Mall.ThirdCore/Message/MessageCore.cs

@@ -66,7 +66,7 @@ namespace Mall.ThirdCore.Message
                 IAcsClient acsClient = new DefaultAcsClient(profile);
                 //必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式
                 request.PhoneNumbers = obj["phoneNumber"].ToString();
-                request.SignName = aliSms["signName"].ToString();
+                request.SignName = "印象之旅"; //aliSms["signName"].ToString();
                 //必填:短信模板-可在短信控制台中找到
                 request.TemplateCode = obj["templateCode"].ToString();
                 //可选:模板中的变量替换JSON串,如模板内容为"您的验证码为${code}"时,此处的值为

Mall.WebApi/Controllers/Product/AppletGuideCarController.cs

@@ -346,6 +346,22 @@ namespace Mall.WebApi.Controllers.Product
             return ApiResult.Success("", Robj);
         }
 
+        /// <summary>
+        /// 获取提前预约天数
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetGuideCarInfoForPagePath(object requestMsg)
+        {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+
+            var model = guideCarModule.GetGuideCarInfo(req.TenantId, req.MallBaseId);
+            return ApiResult.Success("", new
+            {
+                model.PagePath
+            });
+        }
+
 
         /// <summary>
         /// 获取车辆分类下拉

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -252,7 +252,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.Final_Price,
                     y.Number,
                     y.IsComment,
-                    y.FreeShippingRemarks
+                    y.FreeShippingRemarks,
+                    InsuranceMoney = y.InsuranceMoney ?? 0
                 }),
                 x.OrderStatus,
                 OrderStatusName = x.OrderStatus.GetEnumName(),
@@ -534,7 +535,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             if (string.IsNullOrEmpty(demodel.ShoppingAddress))
             {
-                return ApiResult.ParamIsNull("接送地址地址不能为空");
+                return ApiResult.ParamIsNull("接送地址不能为空");
             }
             if (!demodel.TripSTime.HasValue) 
             {
@@ -584,6 +585,7 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UserId = userInfo.UserId;
             demodel.SmallShopsId = req.SmallShopsId;
             demodel.OrderClassify = 1;
+            demodel.DestinationAddress ??= "";
             #endregion
 
             return orderModule.SetAppletSDGoodsOrderInfo(demodel);

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -132,6 +132,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.YFMoney,
                     y.PayMoney,
                     CouponMoney = y.CouponMoney ?? 0,
+                    InsuranceMoney = y.InsuranceMoney ?? 0,
+                    InsuranceCostMoney = y.InsuranceCostMoney ?? 0,
                     IntegralMoney = y.IntegralMoney ?? 0,
                     IntegralNumber = y.IntegralNumber ?? 0,
                     SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new

Mall.WebApi/appsettings.json

@@ -16,6 +16,11 @@
       "Microsoft.Hosting.Lifetime": "Information"
     }
   },
+  "AliSms": {
+    "signName": "印象之旅",
+    "accessKeyId": "LTAIwE7l9dImZSa3",
+    "accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
+  },
   "JwtSecretKey": "@VIITTOREBORN*2018",
   "JwtExpirTime": 2592000,
   "ApiExpirTime": 2592000,
@@ -56,7 +61,7 @@
     "Port": 5672,
     "UserName": "guest",
     "Password": "viitto2019"
-  }, 
+  },
   "RedisSetting": {
     "RedisServer": "47.96.23.199",
     "RedisPort": "6379",