Commit 85ddae70 authored by 吴春's avatar 吴春

vip购买设置

parent 816cde64
...@@ -312,5 +312,27 @@ namespace Mall.Model.Entity.User ...@@ -312,5 +312,27 @@ namespace Mall.Model.Entity.User
set; set;
} }
/// <summary>
/// 是否显示vip购买图标0-否,1-是
/// </summary>
public int IsShowVIPBuyPic { get; set; }
/// <summary>
/// vip购买链接图标
/// </summary>
public string VipBuyICO
{
get;
set;
} /// <summary>
/// vip购买链接
/// </summary>
public string VipBuyUrl
{
get;
set;
}
} }
} }
...@@ -43,7 +43,6 @@ namespace Mall.Model.Entity.User ...@@ -43,7 +43,6 @@ namespace Mall.Model.Entity.User
/// <summary> /// <summary>
/// 背景颜色 /// 背景颜色
/// </summary> /// </summary>
......
...@@ -1017,7 +1017,10 @@ namespace Mall.Module.User ...@@ -1017,7 +1017,10 @@ namespace Mall.Module.User
{ nameof(RB_Distributor_Custom.OneDistributionName),demodel.OneDistributionName}, { nameof(RB_Distributor_Custom.OneDistributionName),demodel.OneDistributionName},
{ nameof(RB_Distributor_Custom.TwoDistributionName),demodel.TwoDistributionName}, { nameof(RB_Distributor_Custom.TwoDistributionName),demodel.TwoDistributionName},
{ nameof(RB_Distributor_Custom.ThreeDistributionName),demodel.ThreeDistributionName}, { nameof(RB_Distributor_Custom.ThreeDistributionName),demodel.ThreeDistributionName},
{ nameof(RB_Distributor_Custom.UpdateDate),demodel.UpdateDate} { nameof(RB_Distributor_Custom.UpdateDate),demodel.UpdateDate},
{ nameof(RB_Distributor_Custom.IsShowVIPBuyPic),demodel.IsShowVIPBuyPic},
{ nameof(RB_Distributor_Custom.VipBuyICO),demodel.VipBuyICO},
{ nameof(RB_Distributor_Custom.VipBuyUrl),demodel.VipBuyUrl}
}; };
List<WhereHelper> whereHelpers = new List<WhereHelper>() { List<WhereHelper> whereHelpers = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
......
...@@ -1912,6 +1912,9 @@ namespace Mall.WebApi.Controllers ...@@ -1912,6 +1912,9 @@ namespace Mall.WebApi.Controllers
one_share = new { name = distributorCustom?.OneDistributionName, defaultStr = "一级分销名称" }, one_share = new { name = distributorCustom?.OneDistributionName, defaultStr = "一级分销名称" },
second_share = new { name = distributorCustom?.TwoDistributionName, defaultStr = "二级分销名称" }, second_share = new { name = distributorCustom?.TwoDistributionName, defaultStr = "二级分销名称" },
three_share = new { name = distributorCustom?.ThreeDistributionName, defaultStr = "三级分销名称" }, three_share = new { name = distributorCustom?.ThreeDistributionName, defaultStr = "三级分销名称" },
isshowvipbuypic = new { name = distributorCustom?.IsShowVIPBuyPic, defaultStr = "0" },
vipbuyico = distributorCustom?.VipBuyICO,
vipbuyurl = distributorCustom?.VipBuyUrl,
}, },
apply = new apply = new
{ {
......
...@@ -942,7 +942,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -942,7 +942,7 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请传递分销申请下文本颜色"); return ApiResult.ParamIsNull("请传递分销申请下文本颜色");
} }
//
if (string.IsNullOrEmpty(demodel.DistributionCommissionName)) if (string.IsNullOrEmpty(demodel.DistributionCommissionName))
{ {
return ApiResult.ParamIsNull("请传递分销中心下分销佣金"); return ApiResult.ParamIsNull("请传递分销中心下分销佣金");
...@@ -1043,7 +1043,14 @@ namespace Mall.WebApi.Controllers.User ...@@ -1043,7 +1043,14 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请传递分销商下三级分销名称"); return ApiResult.ParamIsNull("请传递分销商下三级分销名称");
} }
if (string.IsNullOrWhiteSpace(demodel.VipBuyUrl))
{
return ApiResult.Failed("VIP购买链接不能为空");
}
if (string.IsNullOrWhiteSpace(demodel.VipBuyICO))
{
return ApiResult.Failed("VIP购买链接图标不能为空");
}
demodel.TenantId = Convert.ToInt32(requestParm.uid); demodel.TenantId = Convert.ToInt32(requestParm.uid);
demodel.MallBaseId = requestParm.MallBaseId; demodel.MallBaseId = requestParm.MallBaseId;
......
...@@ -81,6 +81,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -81,6 +81,8 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.Failed("背景颜色不能为空"); return ApiResult.Failed("背景颜色不能为空");
} }
if (demodel.Id == 0) if (demodel.Id == 0)
{ {
demodel.TenantId = Convert.ToInt32(req.uid); demodel.TenantId = Convert.ToInt32(req.uid);
......
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