Commit 5fccf7ad authored by liudong1993's avatar liudong1993

Merge branch 'sdzq' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents 614ece43 b67f9380
......@@ -24,6 +24,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NPOI" Version="2.4.1" />
<PackageReference Include="PinYinConverterCore" Version="1.0.2" />
<PackageReference Include="QRCoder" Version="1.3.9" />
<PackageReference Include="StackExchange.Redis" Version="2.0.601" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.6.0" />
......
using System;
using Microsoft.International.Converters.PinYinConverter;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO;
......@@ -573,6 +574,29 @@ namespace Mall.Common.Plugin
#region 字符转换
/// <summary>
/// 汉字转化为拼音
/// </summary>
/// <param name="str">汉字</param>
/// <returns>全拼</returns>
public static string GetPinyin(string str)
{
string r = string.Empty;
foreach (char obj in str)
{
try
{
ChineseChar chineseChar = new ChineseChar(obj);
string t = chineseChar.Pinyins[0].ToString();
r += t.Substring(0, t.Length - 1);
}
catch
{
r += obj.ToString();
}
}
return r;
}
/// <summary>
/// 为字符串左边填充字符
......
......@@ -60,6 +60,8 @@ namespace Mall.Model.Entity.BaseSetUp
/// </summary>
public string EnName { get; set; }
public string PinYin { get; set; }
/// <summary>
/// 四字码
/// </summary>
......
......@@ -54,16 +54,21 @@ namespace Mall.Model.Entity.GuideCar
/// 车辆分类
/// </summary>
public CarClassEnum CarClass { get; set; }
/// <summary>
/// 车辆品牌
/// </summary>
public string CarBrand { get; set; }
public int CarBrandId { get; set; }
/// <summary>
/// 可乘坐人数
/// </summary>
public int GuestNum { get; set; }
/// <summary>
/// 用户评分
/// </summary>
public decimal Score { get; set; }
}
}
using Mall.Common.Enum.GuideCar;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Entity.GuideCar
{
/// <summary>
/// 司导-车辆品牌实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_GuideCar_CarBrand
{
public int ID { get; set; }
/// <summary>
/// 商户id
/// </summary>
public int TenantId { get; set; }
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId { get; set; }
/// <summary>
/// 品牌名称
/// </summary>
public string Name { get; set; }
public int Status { get; set; }
public DateTime CreateDate { get; set; }
public DateTime UpdateDate { get; set; }
/// <summary>
/// 头像
/// </summary>
public string BrandLogo { get; set; }
}
}
......@@ -56,6 +56,9 @@ namespace Mall.Model.Extend.BaseSetUp
}
}
/// <summary>
/// 所属国家
/// </summary>
......
using Mall.Model.Entity.GuideCar;
using System;
using System.Collections.Generic;
using System.Text;
using VT.FW.DB;
namespace Mall.Model.Extend.GuideCar
{
/// <summary>
/// 司导-车辆品牌扩展表
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_GuideCar_CarBrand_Extend: RB_GuideCar_CarBrand
{
public string CarBrandIds { get; set; }
}
}
......@@ -23,5 +23,11 @@ namespace Mall.Model.Extend.GuideCar
/// ids
/// </summary>
public string GuideCarIds { get; set; }
/// <summary>
/// 车辆品牌
/// </summary>
public string CarBrand { get; set; }
}
}
......@@ -77,5 +77,34 @@ namespace Mall.Module.BaseSetUp
}
return flag;
}
/// <summary>
/// 更新地区拼音
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public bool UpdateDestinationPinYin(List<RB_Destination_Extend> list)
{
bool flag = false;
foreach (var model in list)
{
if (model.ID > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Destination.PinYin), model.PinYin},
};
List<WhereHelper> whereHelpers = new List<WhereHelper>()
{
new WhereHelper(){ FiledName=nameof(RB_Destination.ID),FiledValue=model.ID ,OperatorEnum=OperatorEnum.Equal}
};
flag = rb_DestinationRepository.Update(fileds, whereHelpers);
}
}
return flag;
}
}
}
This diff is collapsed.
using Mall.Model.Entity.GuideCar;
using Mall.Model.Extend.GuideCar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.GuideCar
{
/// <summary>
/// 车辆品牌
/// </summary>
public class RB_GuideCar_CarBrandRepository : BaseRepository<RB_GuideCar_CarBrand>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_GuideCar_CarBrand); } }
/// <summary>
/// 司导-车辆品牌列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_GuideCar_CarBrand_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_GuideCar_CarBrand_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_GuideCar_CarBrand_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.Name)} like '%{query.Name}%'");
}
}
return GetPage<RB_GuideCar_CarBrand_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
}
/// <summary>
/// 司导-车辆品牌列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_GuideCar_CarBrand_Extend> GetGuideCarCarBrandList(RB_GuideCar_CarBrand_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_GuideCar_CarBrand_Extend.Status)}=0 ");
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.ID)}={query.ID}");
}
if (!string.IsNullOrEmpty(query.CarBrandIds))
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.ID)} in({query.CarBrandIds})");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND {nameof(RB_GuideCar_CarBrand_Extend.Name)} like '%{query.Name}%'");
}
}
return Get<RB_GuideCar_CarBrand_Extend>(builder.ToString()).ToList();
}
}
}
......@@ -16,6 +16,11 @@ namespace Mall.Repository.GuideCar
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_GuideCar_Car); } }
/// <summary>
/// 表名称
/// </summary>
public string CarBrandTableName { get { return nameof(RB_GuideCar_CarBrand); } }
/// <summary>
/// 司导-车辆列表
/// </summary>
......@@ -27,28 +32,28 @@ namespace Mall.Repository.GuideCar
public List<RB_GuideCar_Car_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_GuideCar_Car_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_GuideCar_Car_Extend.Status)}=0");
builder.Append($" SELECT a.*,b.`Name` as CarBrand FROM {TableName} as a LEFT JOIN {CarBrandTableName} as b on a.CarBrandId=b.ID WHERE a.{nameof(RB_GuideCar_Car_Extend.Status)}=0");
if (query != null)
{
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.TenantId)}={query.TenantId}");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.MallBaseId)}={query.MallBaseId}");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.MallBaseId)}={query.MallBaseId}");
}
if (!string.IsNullOrWhiteSpace(query.Name))
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.Name)} like '%{query.Name}%'");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.Name)} like '%{query.Name}%'");
}
if (!string.IsNullOrWhiteSpace(query.CarBrand))
if (query.CarBrandId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.CarBrand)} like '%{query.CarBrand}%'");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.CarBrandId)}={query.CarBrandId}");
}
if (query.CarClass > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.CarClass)}={(int)query.CarClass}");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.CarClass)}={(int)query.CarClass}");
}
}
return GetPage<RB_GuideCar_Car_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
......@@ -66,14 +71,14 @@ namespace Mall.Repository.GuideCar
public List<RB_GuideCar_Car_Extend> GetGuideCarCarList(RB_GuideCar_Car_Extend query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_GuideCar_Car_Extend.Status)}=0 ");
builder.Append($" SELECT a.*,b.`Name` as CarBrand FROM {TableName} as a LEFT JOIN {CarBrandTableName} as b on a.CarBrandId=b.ID WHERE a.{nameof(RB_GuideCar_Car_Extend.Status)}=0");
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.ID)}={query.ID}");
}
if (!string.IsNullOrEmpty(query.GuideCarIds))
if (!string.IsNullOrEmpty(query.GuideCarIds))
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.ID)} in({query.GuideCarIds})");
}
......@@ -89,9 +94,9 @@ namespace Mall.Repository.GuideCar
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.Name)} like '%{query.Name}%'");
}
if (!string.IsNullOrWhiteSpace(query.CarBrand))
if (query.CarBrandId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_Car_Extend.CarBrand)} like '%{query.CarBrand}%'");
builder.Append($" AND a.{nameof(RB_GuideCar_Car_Extend.CarBrandId)}={query.CarBrandId}");
}
if (query.CarClass > 0)
{
......
using Mall.Model.Entity.GuideCar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Mall.Repository.GuideCar
{
public class RB_GuideCar_CarSearchSearchRepository:BaseRepository<RB_GuideCar_CarSearch>
{
/// <summary>
/// 表名称
/// </summary>
public string TableName { get { return nameof(RB_GuideCar_CarSearch); } }
/// <summary>
/// 司导-车辆搜索模块列表
/// </summary>
/// <param name="pageIndex">页码</param>
/// <param name="pageSize">每页显示条数</param>
/// <param name="rowCount">总条数</param>
/// <param name="query">查询条件</param>
/// <returns></returns>
public List<RB_GuideCar_CarSearch> GetGuideCarSearchList(RB_GuideCar_CarSearch query)
{
StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_GuideCar_CarSearch.Status)}=0 ");
if (query != null)
{
if (query.ID > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarSearch.ID)}={query.ID}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarSearch.TenantId)}={query.TenantId}");
}
if (query.TenantId > 0)
{
builder.Append($" AND {nameof(RB_GuideCar_CarSearch.MallBaseId)}={query.MallBaseId}");
}
}
return Get<RB_GuideCar_CarSearch>(builder.ToString()).ToList();
}
}
}
......@@ -61,9 +61,8 @@ namespace Mall.WebApi.Controllers.MallBase
var result = GetData(list);
return ApiResult.Success("", result);
}
public static List<RB_Destination_Extend> GetData(List<RB_Destination_Extend> nodeList)
{
......@@ -86,5 +85,16 @@ namespace Mall.WebApi.Controllers.MallBase
}
[HttpPost]
public ApiResult UpdateDestinationPinYin()
{
JObject parm = JObject.Parse(RequestParm.msg.ToString());
var list = destinationModule.GetAllList();
list.ForEach(x => x.PinYin = Mall.Common.Plugin.StringHelper.GetPinyin(x.Name));
bool retult = destinationModule.UpdateDestinationPinYin(list);
return ApiResult.Success("");
}
}
}
\ No newline at end of file
......@@ -19,6 +19,7 @@ using Mall.AOP;
using Mall.Model.Extend.GuideCar;
using Mall.Common.Enum.Goods;
using DotNetCore.CAP.Infrastructure;
using Mall.Model.Entity.GuideCar;
namespace Mall.WebApi.Controllers.MallBase
{
......@@ -1109,9 +1110,9 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("请输入车辆名称");
}
if (string.IsNullOrWhiteSpace(query.CarBrand))
if (query.CarBrandId == 0)
{
return ApiResult.Failed("请输入车辆品牌");
return ApiResult.Failed("请选择车辆品牌");
}
if (string.IsNullOrWhiteSpace(query.CarLogo))
{
......@@ -1169,5 +1170,235 @@ namespace Mall.WebApi.Controllers.MallBase
}
#endregion
#region 司导-车辆搜索模块
/// <summary>
/// 新增车辆搜索模块
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetGuideCarSearchInfo()
{
var requestParm = RequestParm;
RB_GuideCar_CarSearch demodel = JsonConvert.DeserializeObject<RB_GuideCar_CarSearch>(requestParm.msg.ToString());
if (demodel.Background == null || string.IsNullOrWhiteSpace(demodel.Background))
{
return ApiResult.ParamIsNull("请传递背景图片");
}
//if (demodel.SearchBackground == null || string.IsNullOrWhiteSpace(demodel.SearchBackground))
//{
// return ApiResult.ParamIsNull("请传递搜索背景图片");
//}
//if (string.IsNullOrEmpty(demodel.SearchTips))
//{
// return ApiResult.ParamIsNull("请传递搜索框提示文字");
//}
if (string.IsNullOrEmpty(demodel.Tips))
{
return ApiResult.ParamIsNull("请传递按钮上面的文字提示");
}
if (string.IsNullOrEmpty(demodel.TipsIco))
{
return ApiResult.ParamIsNull("请传递按钮上面的文字图标提示");
}
//if (string.IsNullOrEmpty(demodel.SearchIco))
//{
// return ApiResult.ParamIsNull("请传递搜索框图标");
//}
if (string.IsNullOrEmpty(demodel.ButtonTextColor))
{
return ApiResult.ParamIsNull("请传递分销申请下文本颜色");
}
if (string.IsNullOrEmpty(demodel.ButtonText))
{
return ApiResult.ParamIsNull("请传递按钮文本");
}
if (demodel.ButtonColor == null || string.IsNullOrWhiteSpace(demodel.ButtonColor))
{
return ApiResult.ParamIsNull("请传递按钮颜色");
}
if (string.IsNullOrEmpty(demodel.ButtonTextColor))
{
return ApiResult.ParamIsNull("请传递按钮文字颜色");
}
demodel.TenantId = Convert.ToInt32(requestParm.uid);
demodel.MallBaseId = requestParm.MallBaseId;
demodel.CreateDate = DateTime.Now;
demodel.UpdateDate = DateTime.Now;
bool flag = guideCarModule.SetGuideCarSearchInfo(demodel);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
/// <summary>
/// 获取车辆搜索模块
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGuideCarSearchInfo()
{
var requestParm = RequestParm;
var model = guideCarModule.GetGuideCarSearchInfo(requestParm.uid, requestParm.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
#region 司导-车辆品牌
/// <summary>
/// 车辆品牌列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGuideCarBrandPageList()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_GuideCar_CarBrand_Extend demodel = JsonConvert.DeserializeObject<RB_GuideCar_CarBrand_Extend>(RequestParm.msg.ToString());
demodel.TenantId = UserInfo.TenantId;
demodel.MallBaseId = parms.MallBaseId;
var list = guideCarModule.GetGuideCarBrandPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.ID,
x.Name,
x.BrandLogo
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取车辆品牌详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGuideCarBrandModel()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_GuideCar_CarBrand_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var oldLogisticsModel = guideCarModule.GetGuideCarBrandModel(query);
if (oldLogisticsModel == null)
{
oldLogisticsModel = new RB_GuideCar_CarBrand_Extend();
}
return ApiResult.Success("", oldLogisticsModel);
}
/// <summary>
/// 获取全部车辆品牌
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGuideCarBrandList()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_GuideCar_CarBrand_Extend>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
var list = guideCarModule.GetGuideCarBrandList(query);
var result = list.Select(x => new { x.ID, x.Name, x.BrandLogo });
return ApiResult.Success("", result);
}
/// <summary>
/// 保存车辆品牌信息
/// </summary>
/// <returns></returns>
public ApiResult AddOrUpdateGuideCarBrand()
{
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_GuideCar_CarBrand>(RequestParm.msg.ToString());
query.TenantId = UserInfo.TenantId;
query.MallBaseId = parms.MallBaseId;
if (query == null)
{
return ApiResult.Failed("请传入车辆信息");
}
else
{
if (string.IsNullOrWhiteSpace(query.Name))
{
return ApiResult.Failed("请输入车辆品牌名称");
}
if (string.IsNullOrWhiteSpace(query.BrandLogo))
{
return ApiResult.Failed("请上传品牌LOGO");
}
if (query.ID == 0)
{
query.CreateDate = System.DateTime.Now;
}
query.UpdateDate = System.DateTime.Now;
bool result = guideCarModule.AddOrUpdateGuideCarBrand(query);
if (result)
{
return ApiResult.Success("车辆信息保存成功");
}
else
{
return ApiResult.Failed("车辆信息保存失败");
}
}
}
/// <summary>
/// 删除车辆品牌
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelGuideCarBrandInfo()
{
var parms = RequestParm;
JObject parmsJob = JObject.Parse(RequestParm.msg.ToString());
string idInfo = parmsJob.GetStringValue("Ids");
if (string.IsNullOrWhiteSpace(idInfo))
{
return ApiResult.Failed("请传递参数");
}
bool flag = guideCarModule.DelGuideCarBrandInfo(idInfo.Split(",").ToList(), UserInfo.TenantId, parms.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#endregion
}
}
\ No newline at end of file
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