Commit 90b0cf25 authored by 黄奎's avatar 黄奎

页面修改

parent 2b858bc0
This diff is collapsed.
...@@ -137,12 +137,14 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen ...@@ -137,12 +137,14 @@ LEFT JOIN (SELECT ServicePersonalId,COUNT(*) as CommentNum from rb_goods_commen
{ {
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'"); builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.Name)} like '%{query.Name}%'");
} }
if (query.ServiceStatus > 0) if (query.ServiceStatus > 0)
{ {
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}"); builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.ServiceStatus)}={query.ServiceStatus}");
} }
if (query.StoreId > 0)
{
builder.Append($" AND {nameof(RB_Reserve_ServicePersonal_Extend.StoreId)}={query.StoreId}");
}
} }
return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList(); return Get<RB_Reserve_ServicePersonal_Extend>(builder.ToString()).ToList();
} }
......
...@@ -137,6 +137,18 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -137,6 +137,18 @@ namespace Mall.WebApi.Controllers.Reserve
Id = storeId, Id = storeId,
MallBaseId = parms.MallBaseId MallBaseId = parms.MallBaseId
}, isFirst: true)?.FirstOrDefault(); }, isFirst: true)?.FirstOrDefault();
string serviceTime = "";
if (storeModel != null)
{
if (storeModel.IsAllDay == 1)
{
serviceTime = "全天";
}
else
{
serviceTime = storeModel.StartTime + "-" + storeModel.EndTime;
}
}
object result = new object result = new
{ {
storeInfo = new storeInfo = new
...@@ -148,7 +160,15 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -148,7 +160,15 @@ namespace Mall.WebApi.Controllers.Reserve
distance = storeModel?.KM, distance = storeModel?.KM,
storeScore = storeModel?.Score, storeScore = storeModel?.Score,
storeCoverImg = storeModel?.CoverImg, storeCoverImg = storeModel?.CoverImg,
storeNavImg = storeModel?.NavImg storeNavImg = storeModel?.NavImg,
storeIntro= storeModel?.Intro,
storeProject= storeModel?.ServiceProject,
storeServiceTime= serviceTime,
consumptionObj = new
{
consumptionStoreId = 0,
consumptionStoreName = "HK门店"
}
}, },
}; };
return ApiResult.Success(data: result); return ApiResult.Success(data: result);
......
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