Skip to content

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

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

parents 3d13b25f 7b9b5470
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 7 deletions
Mall.Common/Enum/MobileCodeTypeEnum.cs
View file @ f2ce1c42
...@@ -86,7 +86,11 @@ namespace Mall.Common.Enum ...@@ -86,7 +86,11 @@ namespace Mall.Common.Enum
/// 导游通知 /// 导游通知
/// </summary> /// </summary>
[EnumField("SMS_201722097")] [EnumField("SMS_201722097")]
GuideMsg =15 GuideMsg =15,
/// <summary>
/// 司导客人通知
/// </summary>
[EnumField("SMS_203186595")]
SDClientMsg = 16
} }
} }
Mall.Model/Entity/GuideCar/RB_GuideCar_CarSearch.cs
View file @ f2ce1c42
...@@ -97,6 +97,7 @@ namespace Mall.Model.Entity.GuideCar ...@@ -97,6 +97,7 @@ namespace Mall.Model.Entity.GuideCar
/// 搜索框图标 /// 搜索框图标
/// </summary> /// </summary>
public string SearchIco { get; set; } public string SearchIco { get; set; }
/// <summary> /// <summary>
/// 搜索圆角像素 /// 搜索圆角像素
/// </summary> /// </summary>
...@@ -106,9 +107,6 @@ namespace Mall.Model.Entity.GuideCar ...@@ -106,9 +107,6 @@ namespace Mall.Model.Entity.GuideCar
set; set;
} }
/// <summary> /// <summary>
/// 按钮圆角像素 /// 按钮圆角像素
/// </summary> /// </summary>
...@@ -117,6 +115,7 @@ namespace Mall.Model.Entity.GuideCar ...@@ -117,6 +115,7 @@ namespace Mall.Model.Entity.GuideCar
get; get;
set; set;
} }
/// <summary> /// <summary>
/// 按钮文本 /// 按钮文本
/// </summary> /// </summary>
......
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ f2ce1c42
...@@ -2086,4 +2086,137 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2086,4 +2086,137 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public string isBold { get; set; } public string isBold { get; set; }
} }
}
/// <summary>
/// 司导插件
/// </summary>
public class driveGuideItem
{
/// <summary>
/// 搜索背景
/// </summary>
public string SearchBackground { get; set; }
/// <summary>
/// 搜索框文字
/// </summary>
public string SearchTips { get; set; }
/// <summary>
/// 是否显示时间筛选0-否，1-是
/// </summary>
public int IsShowDate { get; set; }
/// <summary>
/// 是否显示城市筛选0-否，1-是
/// </summary>
public int IsShowCity { get; set; }
/// <summary>
/// 是否显示地址筛选0-否，1-是
/// </summary>
public int IsShowAddress { get; set; }
/// <summary>
/// 是否显示拼车筛选0-否，1-是
/// </summary>
public int IsShowCarpooling { get; set; }
/// <summary>
/// 是否显示出行类型筛选0-否，1-是
/// </summary>
public int IsShowGuideCarGoodsType { get; set; }
/// <summary>
/// 是否显示车辆类型筛选0-否，1-是
/// </summary>
public int IsShowCarClass { get; set; }
/// <summary>
/// 是否显示出行人数筛选0-否，1-是
/// </summary>
public int IsShowTravelGuestNum { get; set; }
/// <summary>
/// 按钮上面的文字提示
/// </summary>
public string Tips { get; set; }
/// <summary>
/// 按钮上面的文字图标提示
/// </summary>
public string TipsIco { get; set; }
/// <summary>
/// 搜索框图标
/// </summary>
public string SearchIco { get; set; }
/// <summary>
/// 搜索圆角像素
/// </summary>
public int SearchFilletPX
{
get;
set;
}
/// <summary>
/// 按钮圆角像素
/// </summary>
public int ButtonFilletPX
{
get;
set;
}
/// <summary>
/// 按钮文本
/// </summary>
public string ButtonText
{
get;
set;
}
/// <summary>
/// 按钮颜色
/// </summary>
public string ButtonColor
{
get;
set;
}
/// <summary>
/// 按钮文字颜色
/// </summary>
public string ButtonTextColor
{
get;
set;
}
/// <summary>
/// 上边距
/// </summary>
public string PaddingTop { get; set; }
/// <summary>
/// 下边距
/// </summary>
public string PaddingBottom { get; set; }
/// <summary>
/// 左边距
/// </summary>
public string PaddingLeft { get; set; }
/// <summary>
/// 右边距
/// </summary>
public string PaddingRight { get; set; }
}
}
\ No newline at end of file
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ f2ce1c42
...@@ -402,6 +402,42 @@ namespace Mall.Module.MarketingCenter ...@@ -402,6 +402,42 @@ namespace Mall.Module.MarketingCenter
} }
item.data = shopModel; item.data = shopModel;
break; break;
//司导插件
case "drive-guide":
driveGuideItem driveModel = new driveGuideItem();
try
{
var driveData = JsonHelper.DeserializeObject<driveGuideItem>(item.data.ToString());
if (driveData != null)
{
driveModel.SearchBackground = driveData?.SearchBackground ?? "";
driveModel.SearchTips = driveData?.SearchTips ?? "";
driveModel.IsShowDate = driveData?.IsShowDate ?? 1;
driveModel.IsShowCity = driveData?.IsShowCity ?? 1;
driveModel.IsShowAddress = driveData?.IsShowAddress ?? 1;
driveModel.IsShowCarpooling = driveData?.IsShowCarpooling ?? 1;
driveModel.IsShowGuideCarGoodsType = driveData?.IsShowGuideCarGoodsType ?? 1;
driveModel.IsShowCarClass = driveData?.IsShowCarClass ?? 1;
driveModel.IsShowTravelGuestNum = driveData?.IsShowTravelGuestNum ?? 1;
driveModel.Tips = driveData?.Tips ?? "每辆车都会配备一名专业导游，方便游客出行";
driveModel.TipsIco = driveData?.TipsIco ?? Common.Config.GetFileUrl("/Static/dir_icon.png");
driveModel.SearchIco = driveData?.SearchIco ?? "";
driveModel.SearchFilletPX = driveData?.SearchFilletPX ?? 0;
driveModel.ButtonFilletPX = driveData?.ButtonFilletPX ?? 0;
driveModel.ButtonText = driveData?.ButtonText ?? "去订车";
driveModel.ButtonColor = driveData?.ButtonColor ?? "#FF4048";
driveModel.ButtonTextColor = driveData?.ButtonTextColor ?? "#fff";
driveModel.PaddingTop = driveData?.PaddingTop ?? "0";
driveModel.PaddingBottom = driveData?.PaddingBottom ?? "0";
driveModel.PaddingLeft = driveData?.PaddingLeft ?? "0";
driveModel.PaddingRight = driveData?.PaddingRight ?? "0";
}
}
catch
{
}
item.data = driveModel;
break;
} }
} }
......
Mall.Module.Product/OrderModule.cs
View file @ f2ce1c42
...@@ -11384,6 +11384,27 @@ namespace Mall.Module.Product ...@@ -11384,6 +11384,27 @@ namespace Mall.Module.Product
}; };
SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType)); SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType));
} }
#region 给客人通知
try
{
if (ValidateHepler.IsMobileNumber(orderModel.Mobile))
{
MobileCodeTypeEnum mobileCodeType1 = MobileCodeTypeEnum.SDClientMsg;//客人通知
object PhoneMessage = new
{
orderModel.OrderNo,
TripTime = item.TripSTime.Value.ToString("yyyy-MM-dd HH:mm") + " " + ((item.UseDay ?? 0) == Convert.ToDecimal(0.5) ? "半" : Convert.ToInt32(item.UseDay ?? 0).ToString()) + "日",
guideModel.Name,
Tel = Telephone
};
SMSService.SendMsg(orderModel.Mobile, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType1));
}
}
catch (Exception)
{
}
#endregion
} }
} }
} }
......
Mall.Module.User/UserCommonModule.cs
View file @ f2ce1c42
...@@ -527,6 +527,27 @@ namespace Mall.Module.User ...@@ -527,6 +527,27 @@ namespace Mall.Module.User
}; };
SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType)); SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType));
} }
#region 给客人通知
try
{
if (ValidateHepler.IsMobileNumber(oldOrder.Mobile))
{
MobileCodeTypeEnum mobileCodeType1 = MobileCodeTypeEnum.SDClientMsg;//客人通知
object PhoneMessage = new
{
oldOrder.OrderNo,
TripTime = item.TripSTime.Value.ToString("yyyy-MM-dd HH:mm") + " " + ((item.UseDay ?? 0) == Convert.ToDecimal(0.5) ? "半" : Convert.ToInt32(item.UseDay ?? 0).ToString()) + "日",
guideModel.Name,
Tel = Telephone
};
SMSService.SendMsg(oldOrder.Mobile, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType1));
}
}
catch (Exception)
{
}
#endregion
} }
} }
} }
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ f2ce1c42
...@@ -711,6 +711,15 @@ namespace Mall.WebApi.Controllers ...@@ -711,6 +711,15 @@ namespace Mall.WebApi.Controllers
data=shopInfo data=shopInfo
}; };
break; break;
//司导插件
case "drive-guide":
var driveInfo = subItem.data as driveGuideItem;
obj = new
{
id = subItem.Id,
data = driveInfo
};
break;
} }
return obj; return obj;
} }
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ f2ce1c42
...@@ -468,7 +468,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -468,7 +468,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.MallBaseId, x.MallBaseId,
x.SmallShopsId, x.SmallShopsId,
x.SmallShopsName, x.SmallShopsName,
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
TripETime = x.TripETime.HasValue ? x.TripETime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
TripSTime = x.TripSTime.HasValue ? x.TripSTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
Mall.WebApi/Mall.WebApi.csproj
View file @ f2ce1c42
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel> <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
<UserSecretsId>3475e5d7-8a3a-41e5-9f38-19ff5fff50f2</UserSecretsId>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Remove="Properties\PublishProfiles\**" /> <Compile Remove="Properties\PublishProfiles\**" />
......
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