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
6bff28b8
Commit
6bff28b8
authored
Mar 03, 2021
by
吴春
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sdzq-ld' of
http://gitlab.oytour.com/Kui2/mall.oytour.com
into sdzq
parents
5241cfc4
9e8478ce
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
12 deletions
+28
-12
RB_Miai_Activity.cs
Mall.Model/Entity/Miai/RB_Miai_Activity.cs
+6
-1
MiaiModule.cs
Mall.Module.Miai/MiaiModule.cs
+7
-2
AppletMiaiController.cs
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
+13
-8
MiaiController.cs
Mall.WebApi/Controllers/Miai/MiaiController.cs
+2
-1
No files found.
Mall.Model/Entity/Miai/RB_Miai_Activity.cs
View file @
6bff28b8
...
...
@@ -52,10 +52,15 @@ namespace Mall.Model.Entity.Miai
/// </summary>
public
int
UserId
{
get
;
set
;
}
/// <summary>
/// 是否开启报名 1是 2否
/// </summary>
public
int
IsOpenEnroll
{
get
;
set
;
}
/// <summary>
/// 报名截止日期
/// </summary>
public
DateTime
Deadline
{
get
;
set
;
}
public
DateTime
?
Deadline
{
get
;
set
;
}
/// <summary>
/// 删除状态
...
...
Mall.Module.Miai/MiaiModule.cs
View file @
6bff28b8
...
...
@@ -195,7 +195,8 @@ namespace Mall.Module.Miai
UserName
=
umodel
.
Name
,
umodel
.
Photo
,
Sex
,
Deadline
=
model
.
Deadline
.
ToString
(
"yyyy-MM-dd HH:mm"
),
model
.
IsOpenEnroll
,
Deadline
=
model
.
IsOpenEnroll
==
1
?
model
.
Deadline
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm"
)
:
""
,
CreateDate
=
model
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
PeopleNum
,
IsEnroll
,
...
...
@@ -227,7 +228,8 @@ namespace Mall.Module.Miai
model
.
UserId
,
UserName
=
umodel
.
Name
,
umodel
.
Photo
,
Deadline
=
model
.
Deadline
.
ToString
(
"yyyy-MM-dd HH:mm"
),
model
.
IsOpenEnroll
,
Deadline
=
model
.
IsOpenEnroll
==
1
?
model
.
Deadline
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm"
)
:
""
,
CreateDate
=
model
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
),
PeopleNum
,
ReplyNum
=
rlist
.
FirstOrDefault
()?.
ReplyNum
??
0
...
...
@@ -250,6 +252,7 @@ namespace Mall.Module.Miai
{
nameof
(
RB_Miai_Activity_Extend
.
ActivityTitle
),
demodel
.
ActivityTitle
},
{
nameof
(
RB_Miai_Activity_Extend
.
Content
),
demodel
.
Content
},
{
nameof
(
RB_Miai_Activity_Extend
.
Images
),
demodel
.
Images
},
{
nameof
(
RB_Miai_Activity_Extend
.
IsOpenEnroll
),
demodel
.
IsOpenEnroll
},
{
nameof
(
RB_Miai_Activity_Extend
.
Deadline
),
demodel
.
Deadline
},
{
nameof
(
RB_Miai_Activity_Extend
.
UpdateDate
),
demodel
.
UpdateDate
}
};
...
...
@@ -567,6 +570,7 @@ namespace Mall.Module.Miai
if
(
list
.
Any
())
{
return
"已存在报名信息"
;
}
var
model
=
miai_ActivityRepository
.
GetEntity
(
demodel
.
ActivityId
);
if
(
model
==
null
||
model
.
Status
==
1
)
{
return
"活动不存在"
;
}
if
(
model
.
IsOpenEnroll
!=
1
)
{
return
"无法报名"
;
}
if
(
model
.
Deadline
<=
DateTime
.
Now
)
{
return
"已过了报名时间,无法报名"
;
...
...
@@ -588,6 +592,7 @@ namespace Mall.Module.Miai
if
(
model
.
UserId
!=
userInfo
.
UserId
)
{
return
"没有取消权限"
;
}
var
amodel
=
miai_ActivityRepository
.
GetEntity
(
model
.
ActivityId
);
if
(
amodel
==
null
||
amodel
.
Status
==
1
)
{
return
"帖子已被删除"
;
}
if
(
amodel
.
IsOpenEnroll
!=
1
)
{
return
"无法取消报名"
;
}
if
(
amodel
.
Deadline
<=
DateTime
.
Now
)
{
return
"已过了报名时间,无法报名"
;
...
...
Mall.WebApi/Controllers/Miai/AppletMiaiController.cs
View file @
6bff28b8
...
...
@@ -70,10 +70,10 @@ namespace Mall.WebApi.Controllers.MallBase
var
userInfo
=
AppletUserInfo
;
ResultPageModel
pagelist
=
JsonConvert
.
DeserializeObject
<
ResultPageModel
>(
parms
.
msg
.
ToString
());
RB_Miai_Activity_Extend
demodel
=
JsonConvert
.
DeserializeObject
<
RB_Miai_Activity_Extend
>(
parms
.
msg
.
ToString
());
if
(
demodel
.
ForumId
<=
0
)
{
return
ApiResult
.
ParamIsNull
(
"请传递版块id"
);
}
//
if (demodel.ForumId <= 0)
//
{
//
return ApiResult.ParamIsNull("请传递版块id");
//
}
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
var
list
=
miaiModule
.
GetActivityPageList
(
pagelist
.
pageIndex
,
pagelist
.
pageSize
,
out
long
count
,
demodel
);
...
...
@@ -90,7 +90,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
ImageList
,
x
.
ReplyNum
,
x
.
EnrollNum
,
Deadline
=
x
.
Deadline
.
ToString
(
"yyyy-MM-dd HH:mm"
),
x
.
IsOpenEnroll
,
Deadline
=
x
.
IsOpenEnroll
==
1
?
x
.
Deadline
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm"
)
:
""
,
CreateDate
=
x
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
});
return
ApiResult
.
Success
(
""
,
pagelist
);
...
...
@@ -142,9 +143,12 @@ namespace Mall.WebApi.Controllers.MallBase
{
return
ApiResult
.
ParamIsNull
(
"请传递内容"
);
}
if
(
demodel
.
Deadline
<
DateTime
.
Now
)
if
(
demodel
.
IsOpenEnroll
==
1
)
{
return
ApiResult
.
ParamIsNull
(
"请重新选择报名截止日期"
);
if
(
demodel
.
Deadline
<
DateTime
.
Now
)
{
return
ApiResult
.
ParamIsNull
(
"请重新选择报名截止日期"
);
}
}
#
region
内容是否违规
...
...
@@ -555,7 +559,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
ActivityModel
?.
Content
,
x
.
ActivityModel
?.
ImageList
,
x
.
ActivityModel
?.
EnrollNum
,
Deadline
=
x
.
ActivityModel
?.
Deadline
.
ToString
(
"yyyy-MM-dd"
),
x
.
ActivityModel
?.
IsOpenEnroll
,
Deadline
=
x
.
ActivityModel
?.
IsOpenEnroll
==
1
?
x
.
ActivityModel
?.
Deadline
.
Value
.
ToString
(
"yyyy-MM-dd"
)
:
""
,
x
.
ActivityModel
?.
Status
},
CreateDate
=
x
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
...
...
Mall.WebApi/Controllers/Miai/MiaiController.cs
View file @
6bff28b8
...
...
@@ -135,7 +135,8 @@ namespace Mall.WebApi.Controllers.MallBase
x
.
ImageList
,
x
.
ReplyNum
,
x
.
EnrollNum
,
Deadline
=
x
.
Deadline
.
ToString
(
"yyyy-MM-dd HH:mm"
),
x
.
IsOpenEnroll
,
Deadline
=
x
.
IsOpenEnroll
==
1
?
x
.
Deadline
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm"
)
:
""
,
CreateDate
=
x
.
CreateDate
.
ToString
(
"yyyy-MM-dd HH:mm:ss"
)
});
return
ApiResult
.
Success
(
""
,
pagelist
);
...
...
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