Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
85ddae70
Commit
85ddae70
authored
Jul 21, 2020
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vip购买设置
parent
816cde64
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
42 additions
and
6 deletions
+42
-6
RB_Distributor_Custom.cs
Mall.Model/Entity/User/RB_Distributor_Custom.cs
+22
-0
RB_Distributor_FXGradeCustom.cs
Mall.Model/Entity/User/RB_Distributor_FXGradeCustom.cs
+1
-2
UserModule.cs
Mall.Module.User/UserModule.cs
+5
-2
MallHelper.cs
Mall.WebApi/Controllers/Mall/MallHelper.cs
+3
-0
UserController.cs
Mall.WebApi/Controllers/User/UserController.cs
+9
-2
UserVipController.cs
Mall.WebApi/Controllers/User/UserVipController.cs
+2
-0
No files found.
Mall.Model/Entity/User/RB_Distributor_Custom.cs
View file @
85ddae70
...
...
@@ -312,5 +312,27 @@ namespace Mall.Model.Entity.User
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
;
}
}
}
Mall.Model/Entity/User/RB_Distributor_FXGradeCustom.cs
View file @
85ddae70
...
...
@@ -41,8 +41,7 @@ namespace Mall.Model.Entity.User
set
;
}
/// <summary>
/// 背景颜色
...
...
Mall.Module.User/UserModule.cs
View file @
85ddae70
...
...
@@ -1017,8 +1017,11 @@ namespace Mall.Module.User
{
nameof
(
RB_Distributor_Custom
.
OneDistributionName
),
demodel
.
OneDistributionName
},
{
nameof
(
RB_Distributor_Custom
.
TwoDistributionName
),
demodel
.
TwoDistributionName
},
{
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
>()
{
new
WhereHelper
(){
FiledName
=
nameof
(
RB_Distributor_Custom
.
Id
),
...
...
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @
85ddae70
...
...
@@ -1912,6 +1912,9 @@ namespace Mall.WebApi.Controllers
one_share
=
new
{
name
=
distributorCustom
?.
OneDistributionName
,
defaultStr
=
"一级分销名称"
},
second_share
=
new
{
name
=
distributorCustom
?.
TwoDistributionName
,
defaultStr
=
"二级分销名称"
},
three_share
=
new
{
name
=
distributorCustom
?.
ThreeDistributionName
,
defaultStr
=
"三级分销名称"
},
isshowvipbuypic
=
new
{
name
=
distributorCustom
?.
IsShowVIPBuyPic
,
defaultStr
=
"0"
},
vipbuyico
=
distributorCustom
?.
VipBuyICO
,
vipbuyurl
=
distributorCustom
?.
VipBuyUrl
,
},
apply
=
new
{
...
...
Mall.WebApi/Controllers/User/UserController.cs
View file @
85ddae70
...
...
@@ -942,7 +942,7 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
ParamIsNull
(
"请传递分销申请下文本颜色"
);
}
//
if
(
string
.
IsNullOrEmpty
(
demodel
.
DistributionCommissionName
))
{
return
ApiResult
.
ParamIsNull
(
"请传递分销中心下分销佣金"
);
...
...
@@ -1043,7 +1043,14 @@ namespace Mall.WebApi.Controllers.User
{
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
.
MallBaseId
=
requestParm
.
MallBaseId
;
...
...
Mall.WebApi/Controllers/User/UserVipController.cs
View file @
85ddae70
...
...
@@ -81,6 +81,8 @@ namespace Mall.WebApi.Controllers.User
{
return
ApiResult
.
Failed
(
"背景颜色不能为空"
);
}
if
(
demodel
.
Id
==
0
)
{
demodel
.
TenantId
=
Convert
.
ToInt32
(
req
.
uid
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment