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
d249fe2d
Commit
d249fe2d
authored
Mar 02, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
11f5ac8c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
0 deletions
+44
-0
RB_Commerce_Activity.cs
Mall.Model/Entity/TradePavilion/RB_Commerce_Activity.cs
+10
-0
RB_Commerce_Activity_Extend.cs
...Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
+30
-0
CommerceActivityModule.cs
Mall.Module.TradePavilion/CommerceActivityModule.cs
+2
-0
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+2
-0
No files found.
Mall.Model/Entity/TradePavilion/RB_Commerce_Activity.cs
View file @
d249fe2d
...
@@ -82,5 +82,15 @@ namespace Mall.Model.Entity.TradePavilion
...
@@ -82,5 +82,15 @@ namespace Mall.Model.Entity.TradePavilion
/// 删除状态
/// 删除状态
/// </summary>
/// </summary>
public
DateStateEnum
Status
{
get
;
set
;
}
public
DateStateEnum
Status
{
get
;
set
;
}
/// <summary>
/// 报名开始时间
/// </summary>
public
DateTime
?
SignStartTime
{
get
;
set
;
}
/// <summary>
/// 报名截止时间
/// </summary>
public
DateTime
?
SignEndTime
{
get
;
set
;
}
}
}
}
}
Mall.Model/Extend/TradePavilion/RB_Commerce_Activity_Extend.cs
View file @
d249fe2d
...
@@ -58,6 +58,36 @@ namespace Mall.Model.Extend.TradePavilion
...
@@ -58,6 +58,36 @@ namespace Mall.Model.Extend.TradePavilion
}
}
}
}
/// <summary>
/// 是否可报名
/// </summary>
public
int
IsSignUp
{
get
{
int
isSign
=
0
;
if
(
this
.
SignStartTime
!=
null
&&
this
.
SignEndTime
!=
null
)
{
DateTime
currentDay
=
Convert
.
ToDateTime
(
Common
.
ConvertHelper
.
FormatDate
(
DateTime
.
Now
));
if
(
currentDay
>=
this
.
SignStartTime
&&
currentDay
<=
this
.
SignEndTime
)
{
isSign
=
1
;
//可报名
}
}
return
isSign
;
}
}
/// <summary>
/// 报名开始时间
/// </summary>
public
string
SignStartTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
SignStartTime
);
}
}
/// <summary>
/// 报名截止时间
/// </summary>
public
string
SignEndTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
SignEndTime
);
}
}
/// <summary>
/// <summary>
/// 活动状态字符串
/// 活动状态字符串
/// </summary>
/// </summary>
...
...
Mall.Module.TradePavilion/CommerceActivityModule.cs
View file @
d249fe2d
...
@@ -96,6 +96,8 @@ namespace Mall.Module.TradePavilion
...
@@ -96,6 +96,8 @@ namespace Mall.Module.TradePavilion
{
nameof
(
RB_Commerce_Activity_Extend
.
ActivityInfo
),
model
.
ActivityInfo
},
{
nameof
(
RB_Commerce_Activity_Extend
.
ActivityInfo
),
model
.
ActivityInfo
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateBy
),
model
.
UpdateBy
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateDate
),
model
.
UpdateDate
},
{
nameof
(
RB_Commerce_Activity_Extend
.
UpdateDate
),
model
.
UpdateDate
},
{
nameof
(
RB_Commerce_Activity_Extend
.
SignStartTime
),
model
.
SignStartTime
},
{
nameof
(
RB_Commerce_Activity_Extend
.
SignEndTime
),
model
.
SignEndTime
},
};
};
flag
=
commerce_ActivityRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Commerce_Activity_Extend
.
Id
),
model
.
Id
));
flag
=
commerce_ActivityRepository
.
Update
(
fileds
,
new
WhereHelper
(
nameof
(
RB_Commerce_Activity_Extend
.
Id
),
model
.
Id
));
}
}
...
...
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
d249fe2d
...
@@ -336,6 +336,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
...
@@ -336,6 +336,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
CoverImg
=
jObj
.
GetStringValue
(
"CoverImg"
),
CoverImg
=
jObj
.
GetStringValue
(
"CoverImg"
),
ActivityType
=
jObj
.
GetInt
(
"ActivityType"
),
ActivityType
=
jObj
.
GetInt
(
"ActivityType"
),
ActivityInfo
=
jObj
.
GetStringValue
(
"ActivityInfo"
),
ActivityInfo
=
jObj
.
GetStringValue
(
"ActivityInfo"
),
SignStartTime
=
jObj
.
GetDateTime
(
"SignStartTime"
),
SignEndTime
=
jObj
.
GetDateTime
(
"SignEndTime"
),
};
};
try
try
{
{
...
...
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