Commit 8e5ef9a5 authored by 黄奎's avatar 黄奎

页面修改

parent dc17a1e6
......@@ -3535,17 +3535,6 @@ namespace Mall.Module.Product
};
}
#region 门店相关
string categoryIds = "0";
if (model.CategoryList != null && model.CategoryList.Count > 0)
{
categoryIds = string.Join(",", model.CategoryList.Select(qitem => qitem.CategoryId));
}
//服务人员列表
var servicePersionList = new List<RB_Reserve_ServicePersonal_Extend>();
if (model.IsChooseServicePerson == 1)
{
servicePersionList= reserve_ServicePersonalRepository.GetServicePersonalListExtRepository(storeId, model.Id, categoryIds,servicePersionId,chooseDate)?.ToList() ?? new List<Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend>();
}
var storeModel = storesRepository.GetEntity(storeId);
List<StoreReserveDate> storeDateList = new List<StoreReserveDate>();
DateTime currentDay = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
......@@ -3755,16 +3744,6 @@ namespace Mall.Module.Product
video_type = model.VideoType,
isChooseServicePerson = model.IsChooseServicePerson,
depositMoney = model.DepositMoney,
persionList = servicePersionList?.Where(qitem => qitem.ServiceStatus == 1).Select(qitem => new
{
qitem.ServiceLogo,
qitem.Score,
qitem.Name,
qitem.Major,
Gender = qitem.Gender.ToInt(),
ReserveCount=qitem.OrderNum,
ServiceId=qitem.ID
}),
categoryIdList = model.CategoryList.Select(x => x.CategoryId ?? 0).ToList(),
storeDateList = storeDateList.Select(qitem => new {qitem.DayDateStr,qitem.WeekDayStr,qitem.TimeList})
},
......@@ -3774,6 +3753,53 @@ namespace Mall.Module.Product
#endregion
}
/// <summary>
/// 获取线下服务商品预定详情
/// </summary>
/// <param name="goodsId">商品编号</param>
/// <param name="TenantId"></param>
/// <param name="MallBaseId"></param>
/// <param name="storeId">门店编号</param>
/// <param name="chooseDate">选择日期</param>
/// <returns></returns>
public object GetServerpersionListInfoModule(int goodsId, int TenantId, int MallBaseId, int storeId = 0, int servicePersionId = 0, string chooseDate = "")
{
var model = goodsRepository.GetEntity(goodsId).RefMapperTo<RB_Goods_Extend>();
if (model == null || model.TenantId != TenantId || model.MallBaseId != MallBaseId)
{
return null;
}
#region 基本信息
//查询分类
model.CategoryList = goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsId = goodsId, TenantId = TenantId, MallBaseId = MallBaseId });
string categoryIds = "0";
if (model.CategoryList != null && model.CategoryList.Count > 0)
{
categoryIds = string.Join(",", model.CategoryList.Select(qitem => qitem.CategoryId));
}
//服务人员列表
var servicePersionList = new List<RB_Reserve_ServicePersonal_Extend>();
if (model.IsChooseServicePerson == 1)
{
servicePersionList = reserve_ServicePersonalRepository.GetServicePersonalListExtRepository(storeId, model.Id, categoryIds, servicePersionId, chooseDate)?.ToList() ?? new List<Model.Extend.Reserve.RB_Reserve_ServicePersonal_Extend>();
}
#endregion
return new
{
persionList = servicePersionList?.Where(qitem => qitem.ServiceStatus == 1).Select(qitem => new
{
qitem.ServiceLogo,
qitem.Score,
qitem.Name,
qitem.Major,
Gender = qitem.Gender.ToInt(),
ReserveCount = qitem.OrderNum,
ServiceId = qitem.ID
})
};
}
/// <summary>
/// 获取线下服务人员列表
/// </summary>
......
......@@ -435,6 +435,33 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success("", Robj);
}
/// <summary>
/// 预定页面获取服务列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetServerpersionListInfo(object requestMsg)
{
var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
if (req.MallBaseId <= 0)
{
return ApiResult.ParamIsNull();
}
JObject prams = JObject.Parse(req.msg.ToString());
int GoodsId = prams.GetInt("GoodsId", 0);
int StoreId = prams.GetInt("StoreId", 0);
int servicePersionId = prams.GetInt("servicePersionId", 0);
//选择的日期
string chooseDate = prams.GetStringValue("chooseDate");
if (StoreId <= 0 || GoodsId <= 0)
{
return ApiResult.ParamIsNull(message: "请选择门店");
}
int UserId = req.UserId;
object Robj = productModule.GetServerpersionListInfoModule(GoodsId, req.TenantId, req.MallBaseId, storeId: StoreId, servicePersionId: servicePersionId, chooseDate: chooseDate);
return ApiResult.Success("", Robj);
}
/// <summary>
/// 获取门店服务人员
/// </summary>
......
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