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
4bfdcc7a
Commit
4bfdcc7a
authored
Sep 03, 2021
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
b9ad359f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
RB_FirstShop_ListEnroll.cs
Mall.Model/Entity/TradePavilion/RB_FirstShop_ListEnroll.cs
+1
-1
FirstShopListModule.cs
Mall.Module.TradePavilion/FirstShopListModule.cs
+1
-1
RB_FirstShop_ListRepository.cs
Mall.Repository/TradePavilion/RB_FirstShop_ListRepository.cs
+1
-1
AppletTradeController.cs
...WebApi/Controllers/TradePavilion/AppletTradeController.cs
+1
-0
No files found.
Mall.Model/Entity/TradePavilion/RB_FirstShop_ListEnroll.cs
View file @
4bfdcc7a
...
...
@@ -65,7 +65,7 @@ namespace Mall.Model.Entity.TradePavilion
public
string
MedalImageBig
{
get
;
set
;
}
/// <summary>
/// 候选状态 1
报名中
2候选 3淘汰
/// 候选状态 1
未评比
2候选 3淘汰
/// </summary>
public
int
CandidateState
{
get
;
set
;
}
...
...
Mall.Module.TradePavilion/FirstShopListModule.cs
View file @
4bfdcc7a
...
...
@@ -796,7 +796,7 @@ namespace Mall.Module.TradePavilion
if
(
listModel
.
PrizeNum
!=
deList
.
Count
())
{
return
"名单数量不正确"
;
}
//首先清除历史评比
firstShop_ListEnrollRepository
.
ClearHostoryAppraisal
(
listId
,
mallBaseId
);
int
RankListState
=
type
==
1
?
3
:
2
;
int
RankListState
=
type
==
1
?
3
:
1
;
if
(
type
==
2
)
{
//设置榜单为已放榜
...
...
Mall.Repository/TradePavilion/RB_FirstShop_ListRepository.cs
View file @
4bfdcc7a
...
...
@@ -189,7 +189,7 @@ where {where} order by w.Id desc
}
if
(
dmodel
.
CreateBy
>
0
)
{
where
+=
$@" and
w
.
{
nameof
(
RB_FirstShop_ListEnroll_Extend
.
UserId
)}
=
{
dmodel
.
CreateBy
}
"
;
where
+=
$@" and
e
.
{
nameof
(
RB_FirstShop_ListEnroll_Extend
.
UserId
)}
=
{
dmodel
.
CreateBy
}
"
;
}
string
sql
=
$@"select w.*,e.ObjectType,e.ObjectId,e.Rank,e.MedalImage,e.RankListState from RB_FirstShop_List w
...
...
Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs
View file @
4bfdcc7a
...
...
@@ -2426,6 +2426,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
RB_FirstShop_List_Extend
demodel
=
JsonHelper
.
DeserializeObject
<
RB_FirstShop_List_Extend
>(
req
.
msg
.
ToString
());
demodel
.
TenantId
=
userInfo
.
TenantId
;
demodel
.
MallBaseId
=
userInfo
.
MallBaseId
;
demodel
.
CreateBy
=
userInfo
.
UserId
;
var
list
=
firstShopListModule
.
GetAppletMyEnrollFistShopListPageList
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
count
,
demodel
);
pageModel
.
count
=
Convert
.
ToInt32
(
count
);
...
...
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