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
8a4434d4
Commit
8a4434d4
authored
Oct 28, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
7d6637d2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
39 deletions
+6
-39
RB_MiniProgram.cs
Mall.Model/Entity/User/RB_MiniProgram.cs
+5
-0
MallBaseModule.cs
Mall.Module.BaseSetUp/MallBaseModule.cs
+0
-13
MallBaseController.cs
Mall.WebApi/Controllers/MallBase/MallBaseController.cs
+1
-26
No files found.
Mall.Model/Entity/User/RB_MiniProgram.cs
View file @
8a4434d4
...
...
@@ -501,6 +501,11 @@ namespace Mall.Model.Entity.User
/// 是否是韩国馆(1-是)
/// </summary>
public
int
IsKorea
{
get
;
set
;
}
/// <summary>
/// 用户查看微信次数
/// </summary>
public
int
LookWeChatTimes
{
get
;
set
;
}
}
...
...
Mall.Module.BaseSetUp/MallBaseModule.cs
View file @
8a4434d4
...
...
@@ -64,19 +64,6 @@ namespace Mall.Module.BaseSetUp
}
/// <summary>
/// 根据编号获取实体
/// </summary>
/// <param name="ID"></param>
/// <returns></returns>
public
RB_MallBase
GetMallBaseEntity
(
int
ID
)
{
return
mallBaseRepository
.
GetEntity
(
ID
);
}
/// <summary>
/// 新增/修改基础信息
/// </summary>
...
...
Mall.WebApi/Controllers/MallBase/MallBaseController.cs
View file @
8a4434d4
...
...
@@ -45,32 +45,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
query
.
TenantId
=
UserInfo
.
TenantId
;
query
.
MallBaseId
=
parms
.
MallBaseId
;
//if (query.ID == 0)//新增
//{
// var TenantModel = TenantModule.GetTenantModule(query.TenantId);
// if (TenantModel == null)
// {
// return ApiResult.Failed("请确保商户信息正确");
// }
// if (TenantModel.AccountStatus != 2)
// {
// return ApiResult.Failed("商户状态审核不通过");
// }
// if (TenantModel.IsEffective == 0 && TenantModel.AccountValidate.HasValue && TenantModel.AccountValidate.Value < System.DateTime.Now)
// {
// return ApiResult.Failed("商户账号已过期");
// }
// //判断当前商户下面有多少小程序
// if (TenantModel.CreateMiniPrograme.HasValue)
// {
// var oldList = mallBaseModule.GetListRepository(query);
// if (oldList.Count() >= TenantModel.CreateMiniPrograme.Value)
// {
// return ApiResult.Failed("商户可建小程序数:" + TenantModel.CreateMiniPrograme.Value);
// }
// }
//}
bool
result
=
mallBaseModule
.
AddOrUpdateMallBase
(
query
);
if
(
result
)
{
...
...
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