记得上下班打卡 | 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
b771955d
Commit
b771955d
authored
Apr 15, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
02550d85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
saleData.html
...urces/templates/zhengzai/smile/smileTickets/saleData.html
+2
-1
SmileShowServiceImpl.java
...min/zhengzai/smile/service/impl/SmileShowServiceImpl.java
+2
-2
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html
View file @
b771955d
...
@@ -62,7 +62,8 @@
...
@@ -62,7 +62,8 @@
<div
th:each=
"itemAgent : ${item.dataAgentVos}"
>
<div
th:each=
"itemAgent : ${item.dataAgentVos}"
>
<td
th:text=
"${itemAgent.number}"
></td>
<td
th:text=
"${itemAgent.number}"
></td>
</div>
</div>
<td
th:each=
"itemAgent : ${item.dataAgentVos}"
th:text=
"${itemAgent.price}"
></td>
<td
th:each=
"itemAgent : ${item.dataAgentVos}"
th:text=
"${itemAgent.number}"
></td>
<!-- <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.price}"></td>-->
<td
th:if=
"${item.priceStatus!=0}"
th:text=
"待打款"
></td>
<td
th:if=
"${item.priceStatus!=0}"
th:text=
"待打款"
></td>
<td
th:if=
"${item.priceStatus==0}"
th:text=
"已打款"
></td>
<td
th:if=
"${item.priceStatus==0}"
th:text=
"已打款"
></td>
<td
th:if=
"${item.priceStatus!=0}"
th:text=
"打款按钮"
></td>
<td
th:if=
"${item.priceStatus!=0}"
th:text=
"打款按钮"
></td>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java
View file @
b771955d
...
@@ -347,7 +347,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
...
@@ -347,7 +347,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userDataAgentVo
.
setPrice
(
new
BigDecimal
(
0
));
userDataAgentVo
.
setPrice
(
new
BigDecimal
(
0
));
userDataAgentVo
.
setAgent
(
smileUser
.
getType
()
==
1
?
map
.
get
(
smileAgent
.
getTicketsId
()).
getTotalCarry
()
:
map
.
get
(
smileAgent
.
getTicketsId
()).
getOrdCarry
());
userDataAgentVo
.
setAgent
(
smileUser
.
getType
()
==
1
?
map
.
get
(
smileAgent
.
getTicketsId
()).
getTotalCarry
()
:
map
.
get
(
smileAgent
.
getTicketsId
()).
getOrdCarry
());
userDataAgentVo
.
setCommission
(
new
BigDecimal
(
0
));
userDataAgentVo
.
setCommission
(
new
BigDecimal
(
0
));
log
.
info
(
"saleData:演出id:{},用户id:{},票提id:{}"
,
performancesId
,
smileUser
.
getUid
(),
smileAgent
.
getTicketsId
());
log
.
debug
(
"saleData:演出id:{},用户id:{},票提id:{}"
,
performancesId
,
smileUser
.
getUid
(),
smileAgent
.
getTicketsId
());
}
}
//判断该用户是否是总代理
//判断该用户是否是总代理
if
(
smileUser
.
getType
()
==
1
)
{
if
(
smileUser
.
getType
()
==
1
)
{
...
@@ -356,7 +356,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
...
@@ -356,7 +356,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
if
(
orgMap
!=
null
)
{
if
(
orgMap
!=
null
)
{
userDataAgentVo
.
setCommission
(
userDataAgentVo
.
getCommission
().
add
((
BigDecimal
)
orgMap
.
get
(
"totalPrice"
)));
userDataAgentVo
.
setCommission
(
userDataAgentVo
.
getCommission
().
add
((
BigDecimal
)
orgMap
.
get
(
"totalPrice"
)));
}
else
{
}
else
{
log
.
info
(
"saleData:演出id:{},用户id:{},票提id:{}"
,
performancesId
,
smileUser
.
getUid
(),
smileAgent
.
getTicketsId
());
log
.
debug
(
"saleData:演出id:{},用户id:{},票提id:{}"
,
performancesId
,
smileUser
.
getUid
(),
smileAgent
.
getTicketsId
());
}
}
}
}
if
(
userDataAgentVo
.
getCommission
().
compareTo
(
new
BigDecimal
(
0
))
!=
0
)
{
if
(
userDataAgentVo
.
getCommission
().
compareTo
(
new
BigDecimal
(
0
))
!=
0
)
{
...
...
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