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
d70ddbd1
Commit
d70ddbd1
authored
Sep 21, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
2648f69c
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
74 additions
and
2 deletions
+74
-2
RequestParm.cs
Mall.Common/API/RequestParm.cs
+5
-0
UserInfo.cs
Mall.Common/API/UserInfo.cs
+5
-0
RB_Miniprogram_Page_Templ.cs
...Model/Entity/MarketingCenter/RB_Miniprogram_Page_Templ.cs
+5
-1
RB_MiniProgram.cs
Mall.Model/Entity/User/RB_MiniProgram.cs
+5
-0
RB_MiniProgram_FenXiaoPoster.cs
Mall.Model/Entity/User/RB_MiniProgram_FenXiaoPoster.cs
+4
-0
RB_MiniProgram_GoodPoster.cs
Mall.Model/Entity/User/RB_MiniProgram_GoodPoster.cs
+5
-0
MiniprogramPageTemplModule.cs
Mall.Module.MarketingCenter/MiniprogramPageTemplModule.cs
+18
-0
RB_Miniprogram_Page_TemplRepository.cs
...ry/MarketingCenter/RB_Miniprogram_Page_TemplRepository.cs
+12
-0
TemplateController.cs
....WebApi/Controllers/MarketingCenter/TemplateController.cs
+13
-0
TenantController.cs
Mall.WebApi/Controllers/User/TenantController.cs
+2
-1
No files found.
Mall.Common/API/RequestParm.cs
View file @
d70ddbd1
...
...
@@ -22,6 +22,11 @@ namespace Mall.Common.API
/// </summary>
public
int
MallBaseId
{
get
;
set
;
}
/// <summary>
/// 是否开启校园版
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
/// <summary>
/// 命令
/// </summary>
...
...
Mall.Common/API/UserInfo.cs
View file @
d70ddbd1
...
...
@@ -29,6 +29,11 @@ namespace Mall.Common
set
;
}
/// <summary>
/// 是否开启校园版(1-开启)
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
/// <summary>
/// 账号
/// </summary>
...
...
Mall.Model/Entity/MarketingCenter/RB_Miniprogram_Page_Templ.cs
View file @
d70ddbd1
...
...
@@ -102,6 +102,10 @@ namespace Mall.Model.Entity.MarketingCenter
get
;
set
;
}
}
/// <summary>
/// 是否为校园版首页
/// </summary>
public
int
IsSchoolHomePage
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_MiniProgram.cs
View file @
d70ddbd1
...
...
@@ -413,5 +413,10 @@ namespace Mall.Model.Entity.User
/// 是否回收
/// </summary>
public
int
Is_Recycle
{
get
;
set
;
}
/// <summary>
/// 是否开启校园版(1-开启)
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_MiniProgram_FenXiaoPoster.cs
View file @
d70ddbd1
...
...
@@ -102,5 +102,9 @@ namespace Mall.Model.Entity.User
/// </summary>
public
int
QrCodeType
{
get
;
set
;
}
/// <summary>
/// 是否开启校园版(1-开启)
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_MiniProgram_GoodPoster.cs
View file @
d70ddbd1
...
...
@@ -38,5 +38,10 @@ namespace Mall.Model.Entity.User
/// 商品图片数量
/// </summary>
public
string
GoodsImgCount
{
get
;
set
;
}
/// <summary>
/// 是否开启校园版(1-开启);
/// </summary>
public
int
IsOpenSchool
{
get
;
set
;
}
}
}
Mall.Module.MarketingCenter/MiniprogramPageTemplModule.cs
View file @
d70ddbd1
...
...
@@ -173,6 +173,24 @@ namespace Mall.Module.MarketingCenter
return
flag
;
}
/// <summary>
/// 更新模板是否设为校园首页
/// </summary>
/// <param name="Id"></param>
/// <param name="IsSchoolHomePage"></param>
/// <param name="MallBaseId">小程序Id</param>
/// <returns></returns>
public
bool
SetMiniprogramPageTemplSchoolIsHomeModule
(
object
Id
,
int
IsSchoolHomePage
,
int
MallBaseId
)
{
bool
flag
=
pageRepository
.
UpdateSchoolIsHomeRepository
(
MallBaseId
);
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
nameof
(
RB_Miniprogram_Page_Templ_Extend
.
IsSchoolHomePage
),
IsSchoolHomePage
}
};
flag
=
pageRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Miniprogram_Page_Templ_Extend
.
Id
),
Id
));
return
flag
;
}
/// <summary>
/// 更新自定义页面状态
/// </summary>
...
...
Mall.Repository/MarketingCenter/RB_Miniprogram_Page_TemplRepository.cs
View file @
d70ddbd1
...
...
@@ -54,6 +54,18 @@ namespace Mall.Repository.MarketingCenter
return
base
.
Execute
(
builder
.
ToString
())>
0
;
}
/// <summary>
/// 设置不为校园首页
/// </summary>
/// <param name="MallBaseId">小程序ID</param>
/// <returns></returns>
public
bool
UpdateSchoolIsHomeRepository
(
int
MallBaseId
)
{
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
" UPDATE RB_Miniprogram_Page_Templ SET IsSchoolHomePage=0 WHERE MallBaseId={0} "
,
MallBaseId
);
return
base
.
Execute
(
builder
.
ToString
())
>
0
;
}
/// <summary>
/// 小程序自定义页面列表
...
...
Mall.WebApi/Controllers/MarketingCenter/TemplateController.cs
View file @
d70ddbd1
...
...
@@ -224,6 +224,19 @@ namespace Mall.WebApi.Controllers.MarketingCenter
}
/// <summary>
/// 更新模板是否设为校园版首页
/// </summary>
/// <returns></returns>
public
ApiResult
SetMiniprogramPageSchoolIsHome
()
{
JObject
parms
=
JObject
.
Parse
(
RequestParm
.
msg
.
ToString
());
var
Id
=
parms
.
GetInt
(
"Id"
,
0
);
var
IsSchoolHomePage
=
parms
.
GetInt
(
"IsSchoolHomePage"
,
1
);
var
flag
=
miniprogramPageTemplModule
.
SetMiniprogramPageTemplSchoolIsHomeModule
(
Id
,
IsSchoolHomePage
,
RequestParm
.
MallBaseId
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
/// <summary>
/// 更新自定义页面状态
/// </summary>
...
...
Mall.WebApi/Controllers/User/TenantController.cs
View file @
d70ddbd1
...
...
@@ -184,7 +184,8 @@ namespace Mall.WebApi.Controllers.User
erptoken
=
erptoken
,
ERPEmpId
=
(
erpUserInfo
?.
EmployeeId
??
0
),
ERPBranchId
=
(
erpUserInfo
?.
RB_Branch_id
??-
1
),
ERPGroupId
=
(
erpUserInfo
?.
RB_Group_id
??
0
)
ERPGroupId
=
(
erpUserInfo
?.
RB_Group_id
??
0
),
IsOpenSchool
=
0
,
};
UserReidsCache
.
UserInfoSet
(
UserModuleCacheKeyConfig
.
Mall_Login_Info
+
model
.
TenantId
,
obj
,
Config
.
JwtExpirTime
);
return
ApiResult
.
Success
(
""
,
obj
);
...
...
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