记得上下班打卡 | 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
1a73d92d
Commit
1a73d92d
authored
Jun 30, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 会员适用时间文案 统计增加 useEnd
parent
53509f6e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
4 deletions
+8
-4
details.html
...ources/templates/zhengzai/kylin/performances/details.html
+1
-1
memberInfo.html
...ces/templates/zhengzai/kylin/performances/memberInfo.html
+3
-3
PerformanceOrderStatisticalDao.java
...net/service/kylin/dao/PerformanceOrderStatisticalDao.java
+1
-0
KylinOrderTicketsServiceImpl.java
...vice/kylin/service/impl/KylinOrderTicketsServiceImpl.java
+3
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @
1a73d92d
...
...
@@ -128,7 +128,7 @@
<span
th:text=
"${dict2.title}"
></span>
</div>
<div>
<span>
使
用日期:
</span>
<span>
适
用日期:
</span>
<span
th:text=
"${dict2.useStart}"
></span>
<span>
-
</span>
<span
th:text=
"${dict2.useEnd}"
></span>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberInfo.html
View file @
1a73d92d
...
...
@@ -126,9 +126,9 @@
</div>
</table>
</div>
<button
type=
"button"
class=
"btn btn-w-m btn-success"
>
审核记录
</button
>
<!-- <button type="button" class="btn btn-w-m btn-success">--
>
<!-- 审核记录-->
<!-- </button>--
>
<button
type=
"button"
class=
"btn btn-w-m btn-success"
th:if=
"*{isSubmit==0}"
onclick=
"submitHandler()"
>
提交审核
</button>
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceOrderStatisticalDao.java
View file @
1a73d92d
...
...
@@ -22,6 +22,7 @@ public class PerformanceOrderStatisticalDao {
private
BigDecimal
price
;
private
Integer
type
;
private
String
useStart
;
private
String
useEnd
;
private
BigDecimal
totalGeneral
=
BigDecimal
.
ZERO
;
private
BigDecimal
saleGeneral
=
BigDecimal
.
ZERO
;
private
BigDecimal
surplusGeneral
=
BigDecimal
.
ZERO
;
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @
1a73d92d
...
...
@@ -1342,6 +1342,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderRefundsVoBase
.
getStatus
(),
orderRefundsVoBase
.
getUpdatedAt
(),
orderRefundsId
});
dataUtils
.
delOrderRefundVo
(
orderRefundsId
);
dataUtils
.
delOrderRefundVoByOrderId
(
orderTicketsId
);
sqls
.
add
(
SqlMapping
.
get
(
"kylin_order_ticket_status.withDraw"
));
sqls
.
add
(
SqlMapping
.
get
(
"kylin_order_ticket_entities.withDraw"
));
sqls
.
add
(
SqlMapping
.
get
(
"kylin_order_refund.withDraw"
));
...
...
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