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

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -364,5 +364,10 @@ namespace Mall.Model.Entity.Product
         /// 服务时间
         /// </summary>
         public string ServiceTime { get; set; }
+
+        /// <summary>
+        /// 商品服务时长
+        /// </summary>
+        public decimal GoodServiceTime { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -4626,6 +4626,7 @@ namespace Mall.Module.Product
             disList.Add(demodel.City ?? 0);
             disList.Add(demodel.District ?? 0);
 
+            var goodModel = goodsRepository.GetEntity(demodel.GoodsId);
 
             decimal TotalExpress = 0;
             decimal TotalMoney = 0;
@@ -5212,6 +5213,7 @@ namespace Mall.Module.Product
 
                     TotalMoney += (item.Final_Price ?? 0);
                     item.OrderType =  OrderTypeEnum.OfflineService;
+                    item.GoodServiceTime = goodModel?.ServiceTime ?? 0;
                     item.GoodsName = gmodel.Name;
                     item.CoverImage = "";
                     if (!string.IsNullOrEmpty(gmodel.CarouselImage) && gmodel.CarouselImage != "[]")
@@ -7179,6 +7181,7 @@ namespace Mall.Module.Product
                     ServiceDate = item.ServiceDate,
                     ServicepersonalId = item.ServicepersonalId,
                     ServiceTime = item.ServiceTime,
+                    GoodServiceTime=item.GoodServiceTime,
                 }, trans);
                 item.Id = detailId;
                 if (detailId > 0 && SatisfiedGoodsList.Any())
@@ -12495,7 +12498,7 @@ namespace Mall.Module.Product
             }
             model.DetailList = dlist;
             //地址
-            model.DistrictAddress = (destinationRepository.GetEntity(model.Province)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.City)?.Name ?? "") + " " + (destinationRepository.GetEntity(model.District)?.Name ?? "");
+            model.DistrictAddress = (destinationRepository.GetEntity((model?.Province??0))?.Name ?? "") + " " + (destinationRepository.GetEntity((model?.City??0))?.Name ?? "") + " " + (destinationRepository.GetEntity((model?.District??0))?.Name ?? "");
             //物流
             var erlist = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
             List<RB_Goods_OrderExpress_Extend> oeList = new List<RB_Goods_OrderExpress_Extend>();
@@ -12734,7 +12737,7 @@ namespace Mall.Module.Product
                     x.GoodsName,
                     x.CoverImage,
                     x.CoverImagePath,
-                    SpecificationList = JsonConvert.DeserializeObject<List<string>>(x.Specification),
+                    SpecificationList = JsonConvert.DeserializeObject<List<string>>((x?.Specification??"")),
                     x.Unit_Price,
                     x.Number,
                     x.Original_Price,