Commit 3d323cae authored by 吴春's avatar 吴春

提交diam

parent 09500f51
...@@ -29,5 +29,7 @@ namespace Mall.Model.Extend.GuideCar ...@@ -29,5 +29,7 @@ namespace Mall.Model.Extend.GuideCar
/// 车辆品牌 /// 车辆品牌
/// </summary> /// </summary>
public string CarBrand { get; set; } public string CarBrand { get; set; }
public string CarClassStr { get; set; }
} }
} }
...@@ -60,7 +60,7 @@ namespace Mall.WebApi.Controllers.Product ...@@ -60,7 +60,7 @@ namespace Mall.WebApi.Controllers.Product
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString()); var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
JObject parm = JObject.Parse(parms.msg.ToString()); JObject parm = JObject.Parse(parms.msg.ToString());
var list = destinationModule.GetAllList(); var list = destinationModule.GetAllList();
var result = list.Where(x => x.CodeLevel == Common.Enum.AreaRegionEnum.CityEnum).Select(x => new { x.ID, x.Name, x.CodeLevel ,x.PinYin,x.ParentID}); var result = list.Where(x => x.CodeLevel == Common.Enum.AreaRegionEnum.CityEnum).Select(x => new { x.ID, x.Name, x.CodeLevel, x.PinYin, x.ParentID });
return ApiResult.Success("", result); return ApiResult.Success("", result);
} }
...@@ -280,7 +280,7 @@ namespace Mall.WebApi.Controllers.Product ...@@ -280,7 +280,7 @@ namespace Mall.WebApi.Controllers.Product
name = model.Name, name = model.Name,
cover_pic = model.CoverImage, cover_pic = model.CoverImage,
video_url = model.VideoAddress, video_url = model.VideoAddress,
guidecartype= model.GuideCarType, guidecartype = model.GuideCarType,
original_price = model.OriginalPrice, original_price = model.OriginalPrice,
unit = model.Unit, unit = model.Unit,
page_url = "/pages/goods/goods?id=" + model.Id, page_url = "/pages/goods/goods?id=" + model.Id,
...@@ -443,6 +443,10 @@ namespace Mall.WebApi.Controllers.Product ...@@ -443,6 +443,10 @@ namespace Mall.WebApi.Controllers.Product
var query = JsonConvert.DeserializeObject<RB_GuideCar_Guide_Extend>(parms.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_GuideCar_Guide_Extend>(parms.msg.ToString());
query.TenantId = parms.TenantId; query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId; query.MallBaseId = parms.MallBaseId;
if (query.ID == 0)
{
return ApiResult.Failed("请传入您要查询的导游ID");
}
var oldLogisticsModel = guideCarModule.GetGuideCarGuideOrderInfo(query); var oldLogisticsModel = guideCarModule.GetGuideCarGuideOrderInfo(query);
if (oldLogisticsModel == null) if (oldLogisticsModel == null)
{ {
...@@ -492,11 +496,19 @@ namespace Mall.WebApi.Controllers.Product ...@@ -492,11 +496,19 @@ namespace Mall.WebApi.Controllers.Product
var query = JsonConvert.DeserializeObject<RB_GuideCar_Car_Extend>(parms.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_GuideCar_Car_Extend>(parms.msg.ToString());
query.TenantId = parms.TenantId; query.TenantId = parms.TenantId;
query.MallBaseId = parms.MallBaseId; query.MallBaseId = parms.MallBaseId;
if (query.ID == 0)
{
return ApiResult.Failed("请传入您要查询的车辆ID");
}
var oldLogisticsModel = guideCarModule.GetGuideCarModel(query); var oldLogisticsModel = guideCarModule.GetGuideCarModel(query);
if (oldLogisticsModel == null) if (oldLogisticsModel == null)
{ {
oldLogisticsModel = new RB_GuideCar_Car_Extend(); oldLogisticsModel = new RB_GuideCar_Car_Extend();
} }
if ((int)oldLogisticsModel.CarClass > 0)
{
oldLogisticsModel.CarClassStr = EnumHelper.GetEnumName(oldLogisticsModel.CarClass);
}
return ApiResult.Success("", oldLogisticsModel); return ApiResult.Success("", oldLogisticsModel);
} }
......
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