Skip to content

M
mall.oytour.com
Commit 973ee4d4 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 20b51fcd
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 21 deletions
Mall.Model/Extend/Product/RB_Goods_Extend.cs
View file @ 973ee4d4
...@@ -50,6 +50,13 @@ namespace Mall.Model.Extend.Product ...@@ -50,6 +50,13 @@ namespace Mall.Model.Extend.Product
/// </summary> /// </summary>
public string GuideTelephone { get; set; } public string GuideTelephone { get; set; }
/// <summary>
/// 头像
/// </summary>
public string GuidePhoto { get; set; }
/// <summary> /// <summary>
/// 车辆名称 /// 车辆名称
/// </summary> /// </summary>
...@@ -72,7 +79,15 @@ namespace Mall.Model.Extend.Product ...@@ -72,7 +79,15 @@ namespace Mall.Model.Extend.Product
/// </summary> /// </summary>
public int? CarBrandId { get; set; } public int? CarBrandId { get; set; }
/// <summary>
/// 剩余座位数
/// </summary>
public int SurplusNum { get; set; }
/// <summary>
/// 地区
/// </summary>
public int RegionId { get; set; }
#endregion #endregion
......
Mall.Repository/Product/RB_GoodsRepository.cs
View file @ 973ee4d4
...@@ -829,7 +829,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -829,7 +829,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
/// <returns></returns> /// <returns></returns>
public List<RB_Goods_Extend> GetAppletPageListForCar(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel) public List<RB_Goods_Extend> GetAppletPageListForCar(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel)
{ {
string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 and gcg.Status=0 and c.Status=0 and d.Status=0 and f.Status=0 and b.IsReserve=1 and a.AdvanceDay<=datediff(b.Date,NOW()) and g.GoodsClassify=1 and g.{nameof(RB_Goods_Extend.GoodsStatus)}=1"; string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 and gcg.Status=0 and c.Status=0 and d.Status=0 and f.Status=0 and b.IsReserve=1 and g.AdvanceDay<=datediff(b.Date,NOW()) and g.GoodsClassify=1 and g.{nameof(RB_Goods_Extend.GoodsStatus)}=1";
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
{ {
where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}"; where += $@" and g.{nameof(RB_Goods_Extend.TenantId)}={dmodel.TenantId}";
...@@ -846,10 +846,10 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -846,10 +846,10 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
{ {
where += $@" and g.{nameof(RB_Goods_Extend.Id)}={dmodel.Id}"; where += $@" and g.{nameof(RB_Goods_Extend.Id)}={dmodel.Id}";
} }
if (dmodel.CarType.HasValue&& (int)dmodel.CarType > 0) if (dmodel.CarType.HasValue && (int)dmodel.CarType > 0)
{ {
where += $@" and g.{nameof(RB_Goods_Extend.CarType)}={(int)dmodel.CarType}"; where += $@" and g.{nameof(RB_Goods_Extend.CarType)}={(int)dmodel.CarType}";
if (dmodel.CarType==Common.Enum.Goods.GuideCarGoodsTypeEnum.Line) if (dmodel.CarType == Common.Enum.Goods.GuideCarGoodsTypeEnum.Line)
{ {
if (dmodel.IsSpell > 0) if (dmodel.IsSpell > 0)
{ {
...@@ -877,7 +877,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -877,7 +877,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
{ {
where += $@" and (g.{nameof(RB_Goods_Extend.RideNum)}-b.ReserveNum)>={dmodel.RideNum}"; where += $@" and (g.{nameof(RB_Goods_Extend.RideNum)}-b.ReserveNum)>={dmodel.RideNum}";
} }
if (dmodel.CarClass.HasValue&& dmodel.CarClass > 0) if (dmodel.CarClass.HasValue && dmodel.CarClass > 0)
{ {
where += $@" and e.CarClass={dmodel.CarClass}"; where += $@" and e.CarClass={dmodel.CarClass}";
} }
...@@ -903,12 +903,13 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -903,12 +903,13 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
} }
if (!string.IsNullOrEmpty(dmodel.StartTime)) if (!string.IsNullOrEmpty(dmodel.StartTime))
{ {
where += $@" and b.Date >='{dmodel.StartTime}'"; where += $" and DATE_FORMAT(b.Date,'%Y-%m-%d' )=DATE_FORMAT('{dmodel.StartTime}','%Y-%m-%d' ) ";
} }
//if (!string.IsNullOrEmpty(dmodel.EndTime)) else
//{ {
// where += $@" and b.Date <='{dmodel.EndTime + " 23:59:59"}'"; where += $" and DATE_FORMAT(b.Date,'%Y-%m-%d' )=DATE_FORMAT('{System.DateTime.Now.AddDays(1)}','%Y-%m-%d' ) ";
//} }
if (dmodel.IsProcurement > 0) if (dmodel.IsProcurement > 0)
{ {
where += $@" and g.{nameof(RB_Goods_Extend.IsProcurement)}={dmodel.IsProcurement}"; where += $@" and g.{nameof(RB_Goods_Extend.IsProcurement)}={dmodel.IsProcurement}";
...@@ -932,7 +933,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -932,7 +933,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
//价格降序 //价格降序
orderBy = " g.Sort desc"; orderBy = " g.Sort desc";
} }
else if (dmodel.OrderBy ==3) else if (dmodel.OrderBy == 3)
{ {
//价格升序 //价格升序
orderBy = " g.SellingPrice asc"; orderBy = " g.SellingPrice asc";
...@@ -952,7 +953,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -952,7 +953,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
//评分降序 //评分降序
orderBy = " e.Score desc"; orderBy = " e.Score desc";
} }
else if (dmodel.OrderBy ==7) else if (dmodel.OrderBy == 7)
{ {
//最新升序 //最新升序
orderBy = " g.CreateDate asc"; orderBy = " g.CreateDate asc";
...@@ -962,14 +963,14 @@ WHERE {where} group by g.Id order by g.CreateDate desc"; ...@@ -962,14 +963,14 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
//最新降序 //最新降序
orderBy = " g.CreateDate desc"; orderBy = " g.CreateDate desc";
} }
string sql = $@"SELECT g.*,c.SiteName,e.`Name` as CarName,e.CarType as GuideCarType,f.ColorName as CarColorName,gcg.Name as GuideName,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone from rb_goods as g string sql = $@"SELECT g.*,(g.RideNum-b.ReserveNum) as SurplusNum,c.SiteName,e.`Name` as CarName,e.CarType as GuideCarType,f.ColorName as CarColorName,gcg.Name as GuideName,gcg.GuidePhoto,gcg.WorkYears as GuideWorkYears,gcg.Score as GuideScore,gcg.Telephone as GuideTelephone from rb_goods as g
LEFT JOIN rb_goods_targetdate as b on g.Id=b.GoodsId LEFT JOIN rb_goods_targetdate as b on g.Id=b.GoodsId
LEFT JOIN rb_guidecar_site as c on g.SiteId=c.ID LEFT JOIN rb_guidecar_site as c on g.SiteId=c.ID
LEFT JOIN rb_guidecar_car as e on e.ID=g.CarId LEFT JOIN rb_guidecar_car as e on e.ID=g.CarId
LEFT JOIN rb_guidecar_siteregion as d on d.SiteId=g.SiteId LEFT JOIN rb_guidecar_siteregion as d on d.SiteId=g.SiteId
LEFT JOIN rb_guidecar_carcolor as f on f.ID=g.CarColorId LEFT JOIN rb_guidecar_carcolor as f on f.ID=g.CarColorId
LEFT JOIN rb_guidecar_guide as gcg on gcg.ID=g.GuideId LEFT JOIN rb_guidecar_guide as gcg on gcg.ID=g.GuideId
where {where} GROUP BY g.Id order by {orderBy}"; where {where} GROUP BY g.Id asc order by {orderBy} ,b.date asc";
return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out rowCount, sql).ToList(); return GetPage<RB_Goods_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
} }
......
Mall.WebApi/Controllers/Product/AppletGuideCarController.cs
View file @ 973ee4d4
...@@ -63,6 +63,49 @@ namespace Mall.WebApi.Controllers.Product ...@@ -63,6 +63,49 @@ namespace Mall.WebApi.Controllers.Product
demodel.SmallShopsId = userModel.SmallShopId; demodel.SmallShopsId = userModel.SmallShopId;
} }
} }
if (string.IsNullOrWhiteSpace(demodel.StartTime))
{
return ApiResult.Failed("请选择取车时间");
}
if (string.IsNullOrWhiteSpace(demodel.EndTime))
{
return ApiResult.Failed("请选择还车时间");
}
//if (demodel.RegionId == 0)
//{
// return ApiResult.Failed("请选择区信息");
//}
//else
//{
//}
DateTime tempStartTime = Convert.ToDateTime(demodel.StartTime);
DateTime tempEndTime = Convert.ToDateTime(demodel.EndTime);
if (tempStartTime.ToString("yyyy-MM-dd") == tempEndTime.ToString("yyyy-MM-dd"))//判断使用天数是否是0.5天/1天
{
TimeSpan sp = tempEndTime.Subtract(tempStartTime);
if (sp.Hours > 6)
{
demodel.UseDay = 1;
}
else
{
demodel.UseDay = Convert.ToDecimal(0.5);
}
}
else
{
TimeSpan sp = tempEndTime.Subtract(tempStartTime);
demodel.UseDay = sp.Days;
}
var list = guideCarModule.GetAppletGuidCarPageListForCar(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = guideCarModule.GetAppletGuidCarPageListForCar(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
List<object> RList = new List<object>(); List<object> RList = new List<object>();
if (list.Any()) if (list.Any())
...@@ -206,9 +249,6 @@ namespace Mall.WebApi.Controllers.Product ...@@ -206,9 +249,6 @@ namespace Mall.WebApi.Controllers.Product
price_content = "￥" + (model.SellingPrice ?? 0).ToString("#0.00"), price_content = "￥" + (model.SellingPrice ?? 0).ToString("#0.00"),
is_sales = model.GoodsStatus, is_sales = model.GoodsStatus,
sales = "已售" + model.SalesNum + "件", sales = "已售" + model.SalesNum + "件",
freeShippingName = model.FreeShippingModel.Name,
freeShippingFullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0,
freeShippingFullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
attr_groups = model.SpecificationList.Select(x => new attr_groups = model.SpecificationList.Select(x => new
{ {
attr_group_id = x.Sort, attr_group_id = x.Sort,
...@@ -221,9 +261,16 @@ namespace Mall.WebApi.Controllers.Product ...@@ -221,9 +261,16 @@ namespace Mall.WebApi.Controllers.Product
}) })
}), }),
attr = priceList, attr = priceList,
goods_stock = model.InventoryNum, goods_stock = model.SurplusNum,
goods_num = model.InventoryNum, goods_num = model.SurplusNum,
marketingLogo = model.MarketingLogo marketingLogo = model.MarketingLogo,
carclass = model.CarClass,//车辆型号
carcolorName = model.CarColorName,//车辆颜色
guidename = model.GuideName,//导游名称
guideworkyears = model.GuideWorkYears,//导游从业年限
guidescore = model.GuideScore,//导游评分
guidetelephone = model.GuideTelephone,//导游联系电话
guidephoto = model.GuidePhoto//导游头像
}); });
} }
} }
...@@ -256,6 +303,71 @@ namespace Mall.WebApi.Controllers.Product ...@@ -256,6 +303,71 @@ namespace Mall.WebApi.Controllers.Product
var Robj = guideCarModule.GetAppletGoodsInfo_V2(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId); var Robj = guideCarModule.GetAppletGoodsInfo_V2(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId);
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
/// <summary>
/// 获取车辆分类下拉
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCarClassList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.GuideCar.CarClassEnum));
return ApiResult.Success("", list.Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
}));
}
/// <summary>
/// 获取服务类型枚举
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderListExportEnumList()
{
var list = EnumHelper.GetEnumList(typeof(Common.Enum.Goods.GuideCarGoodsTypeEnum));
return ApiResult.Success("", list.Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
}));
}
/// <summary>
/// 获取车辆搜索模块
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGuideCarSearchInfo(object requestMsg)
{
var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
var model = guideCarModule.GetGuideCarSearchInfo(req.uid, req.MallBaseId);
return ApiResult.Success("", new
{
model.ID,
model.Background,
model.SearchBackground,
model.SearchTips,
model.IsShowDate,
model.IsShowCity,
model.IsShowAddress,
model.IsShowCarpooling,
model.IsShowGuideCarGoodsType,
model.IsShowCarClass,
model.IsShowTravelGuestNum,
model.Tips,
model.TipsIco,
model.SearchIco,
model.SearchFilletPX,
model.ButtonFilletPX,
model.ButtonText,
model.ButtonColor,
model.ButtonTextColor
});
}
#endregion #endregion
#region 订单信息 #region 订单信息
...@@ -269,7 +381,7 @@ namespace Mall.WebApi.Controllers.Product ...@@ -269,7 +381,7 @@ namespace Mall.WebApi.Controllers.Product
/// <returns></returns> /// <returns></returns>
public ApiResult GetGuideCarGuideModel(object requestMsg) public ApiResult GetGuideCarGuideModel(object requestMsg)
{ {
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString()); var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
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;
...@@ -290,7 +402,7 @@ namespace Mall.WebApi.Controllers.Product ...@@ -290,7 +402,7 @@ namespace Mall.WebApi.Controllers.Product
[HttpPost] [HttpPost]
public ApiResult GetGuideCarModel(object requestMsg) public ApiResult GetGuideCarModel(object requestMsg)
{ {
var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString()); var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
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;
......
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