记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
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
董敬伟
liquidnet-bus-v1
Commits
6dae91d8
Commit
6dae91d8
authored
Nov 10, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin
parent
3306269b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
13 deletions
+8
-13
StoneLogsController.java
...in/web/controller/zhengzai/stone/StoneLogsController.java
+3
-6
IScoreService.java
...et/client/admin/zhengzai/stone/service/IScoreService.java
+1
-1
ScoreServiceImpl.java
...t/admin/zhengzai/stone/service/impl/ScoreServiceImpl.java
+2
-4
StoneScoreUserMapper.xml
...m/liquidnet/service/stone/mapper/StoneScoreUserMapper.xml
+1
-1
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+1
-1
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/stone/StoneLogsController.java
View file @
6dae91d8
...
@@ -55,12 +55,9 @@ public class StoneLogsController extends BaseController {
...
@@ -55,12 +55,9 @@ public class StoneLogsController extends BaseController {
@PostMapping
(
"list"
)
@PostMapping
(
"list"
)
@ResponseBody
@ResponseBody
public
TableDataInfo
list
(
StoneScoreListParam
listParam
)
{
public
TableDataInfo
list
(
StoneScoreListParam
listParam
)
{
PageInfo
<
StoneScoreListDto
>
result
=
iScoreService
.
list
(
listParam
);
startPage
();
TableDataInfo
rspData
=
new
TableDataInfo
();
List
<
StoneScoreListDto
>
result
=
iScoreService
.
list
(
listParam
);
rspData
.
setCode
(
0
);
return
this
.
getDataTable
(
result
);
rspData
.
setRows
(
result
.
getList
());
rspData
.
setTotal
(
result
.
getTotal
());
return
rspData
;
}
}
@Log
(
title
=
"积分明细:修改状态"
)
@Log
(
title
=
"积分明细:修改状态"
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/IScoreService.java
View file @
6dae91d8
...
@@ -11,7 +11,7 @@ import java.util.List;
...
@@ -11,7 +11,7 @@ import java.util.List;
public
interface
IScoreService
{
public
interface
IScoreService
{
PageInfo
<
StoneScoreListDto
>
list
(
StoneScoreListParam
param
);
List
<
StoneScoreListDto
>
list
(
StoneScoreListParam
param
);
List
<
StoneScoreListExportDto
>
listExport
(
String
[]
uidList
);
List
<
StoneScoreListExportDto
>
listExport
(
String
[]
uidList
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/stone/service/impl/ScoreServiceImpl.java
View file @
6dae91d8
...
@@ -40,12 +40,10 @@ public class ScoreServiceImpl implements IScoreService {
...
@@ -40,12 +40,10 @@ public class ScoreServiceImpl implements IScoreService {
StoneMongoUtils
mongoUtils
;
StoneMongoUtils
mongoUtils
;
@Override
@Override
public
PageInfo
<
StoneScoreListDto
>
list
(
StoneScoreListParam
param
)
{
public
List
<
StoneScoreListDto
>
list
(
StoneScoreListParam
param
)
{
PageInfo
<
StoneScoreListDto
>
pageInfo
;
param
.
setUid
(
"-999"
);
param
.
setUid
(
"-999"
);
List
<
StoneScoreListDto
>
dto
=
stoneScoreUserMapper
.
list
(
param
);
List
<
StoneScoreListDto
>
dto
=
stoneScoreUserMapper
.
list
(
param
);
pageInfo
=
new
PageInfo
(
dto
);
return
dto
;
return
pageInfo
;
}
}
@Override
@Override
...
...
liquidnet-bus-do/liquidnet-service-stone-do/src/main/resources/com/liquidnet/service/stone/mapper/StoneScoreUserMapper.xml
View file @
6dae91d8
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<if
test=
"status!=''"
>
<if
test=
"status!=''"
>
AND ssut.status = #{status} OR ssut.status is null
AND ssut.status = #{status} OR ssut.status is null
</if>
</if>
<if
test=
"uid!=
''
"
>
<if
test=
"uid!=
-999
"
>
AND ssut.uid =#{uid} OR ssut.status is null
AND ssut.uid =#{uid} OR ssut.status is null
</if>
</if>
</where>
</where>
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
6dae91d8
...
@@ -978,7 +978,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -978,7 +978,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
// log.info("下单消息模版错误",e);
// log.info("下单消息模版错误",e);
// }
// }
//加分
//加分
orderUtils
.
doTask
(
orderTicket
s
.
getUserId
(),
orderTicketData
.
getPerformanceTitle
(),
orderTicketData
.
getPriceActual
());
orderUtils
.
doTask
(
orderTicket
Data
.
getUserId
(),
orderTicketData
.
getPerformanceTitle
(),
orderTicketData
.
getPriceActual
());
//大麦回调
//大麦回调
sycDamaiOrder
(
orderTickets
.
getOrderTicketsId
(),
orderTicketData
.
getIsMember
());
sycDamaiOrder
(
orderTickets
.
getOrderTicketsId
(),
orderTicketData
.
getIsMember
());
}
}
...
...
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