Commit 48c3a68a authored by 黄奎's avatar 黄奎

新增服务时长

parent 5a066757
...@@ -364,5 +364,10 @@ namespace Mall.Model.Entity.Product ...@@ -364,5 +364,10 @@ namespace Mall.Model.Entity.Product
/// 服务时间 /// 服务时间
/// </summary> /// </summary>
public string ServiceTime { get; set; } public string ServiceTime { get; set; }
/// <summary>
/// 商品服务时长
/// </summary>
public decimal GoodServiceTime { get; set; }
} }
} }
...@@ -4626,6 +4626,7 @@ namespace Mall.Module.Product ...@@ -4626,6 +4626,7 @@ namespace Mall.Module.Product
disList.Add(demodel.City ?? 0); disList.Add(demodel.City ?? 0);
disList.Add(demodel.District ?? 0); disList.Add(demodel.District ?? 0);
var goodModel = goodsRepository.GetEntity(demodel.GoodsId);
decimal TotalExpress = 0; decimal TotalExpress = 0;
decimal TotalMoney = 0; decimal TotalMoney = 0;
...@@ -5212,6 +5213,7 @@ namespace Mall.Module.Product ...@@ -5212,6 +5213,7 @@ namespace Mall.Module.Product
TotalMoney += (item.Final_Price ?? 0); TotalMoney += (item.Final_Price ?? 0);
item.OrderType = OrderTypeEnum.OfflineService; item.OrderType = OrderTypeEnum.OfflineService;
item.GoodServiceTime = goodModel?.ServiceTime ?? 0;
item.GoodsName = gmodel.Name; item.GoodsName = gmodel.Name;
item.CoverImage = ""; item.CoverImage = "";
if (!string.IsNullOrEmpty(gmodel.CarouselImage) && gmodel.CarouselImage != "[]") if (!string.IsNullOrEmpty(gmodel.CarouselImage) && gmodel.CarouselImage != "[]")
...@@ -7179,6 +7181,7 @@ namespace Mall.Module.Product ...@@ -7179,6 +7181,7 @@ namespace Mall.Module.Product
ServiceDate = item.ServiceDate, ServiceDate = item.ServiceDate,
ServicepersonalId = item.ServicepersonalId, ServicepersonalId = item.ServicepersonalId,
ServiceTime = item.ServiceTime, ServiceTime = item.ServiceTime,
GoodServiceTime=item.GoodServiceTime,
}, trans); }, trans);
item.Id = detailId; item.Id = detailId;
if (detailId > 0 && SatisfiedGoodsList.Any()) if (detailId > 0 && SatisfiedGoodsList.Any())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment