记得上下班打卡 | 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
7d30602d
Commit
7d30602d
authored
Jul 08, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
演出详情 增加完成和总数展示
parent
63edcef8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
3 deletions
+35
-3
KylinOrderRefundBatchesVo.java
...rvice/kylin/dto/vo/returns/KylinOrderRefundBatchesVo.java
+3
-0
details.html
...sources/templates/zhengzai/kylin/refundBatch/details.html
+10
-0
KylinRefundPerformancesAdminServiceImpl.java
...service/impl/KylinRefundPerformancesAdminServiceImpl.java
+22
-3
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundBatchesVo.java
View file @
7d30602d
...
@@ -34,6 +34,9 @@ public class KylinOrderRefundBatchesVo implements Serializable {
...
@@ -34,6 +34,9 @@ public class KylinOrderRefundBatchesVo implements Serializable {
private
BigDecimal
totalAlipay
;
private
BigDecimal
totalAlipay
;
private
BigDecimal
totalWepay
;
private
BigDecimal
totalWepay
;
private
Integer
totalRefundNum
;
private
Integer
totalCompleteRefundNum
;
@ApiModelProperty
(
value
=
"添加时间"
)
@ApiModelProperty
(
value
=
"添加时间"
)
private
LocalDateTime
createdAt
;
private
LocalDateTime
createdAt
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/details.html
View file @
7d30602d
...
@@ -31,6 +31,16 @@
...
@@ -31,6 +31,16 @@
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.totalWepay}"
>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.totalWepay}"
>
</div>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
总处理数量:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.totalRefundNum}"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
已完成退款数量:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.totalCompleteRefundNum}"
>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-2 control-label"
>
提交时间:
</label>
<label
class=
"col-sm-2 control-label"
>
提交时间:
</label>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.createdAt}"
>
<div
class=
"form-control-static"
th:text=
"${KylinOrderRefundsBatchVo.createdAt}"
>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java
View file @
7d30602d
...
@@ -14,8 +14,10 @@ import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
...
@@ -14,8 +14,10 @@ import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
import
com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam
;
import
com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderRefundBatches
;
import
com.liquidnet.service.kylin.entity.KylinOrderRefundBatches
;
import
com.liquidnet.service.kylin.entity.KylinOrderRefunds
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.liquidnet.service.kylin.entity.KylinPerformances
;
import
com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper
;
import
com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper
;
import
com.liquidnet.service.kylin.mapper.KylinOrderRefundsMapper
;
import
com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper
;
import
com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper
;
import
com.liquidnet.service.kylin.mapper.KylinPerformancesMapper
;
import
com.liquidnet.service.kylin.mapper.KylinPerformancesMapper
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
...
@@ -47,6 +49,9 @@ public class KylinRefundPerformancesAdminServiceImpl {
...
@@ -47,6 +49,9 @@ public class KylinRefundPerformancesAdminServiceImpl {
@Autowired
@Autowired
private
KylinOrderRefundBatchesMapper
kylinOrderRefundBatchesMapper
;
private
KylinOrderRefundBatchesMapper
kylinOrderRefundBatchesMapper
;
@Autowired
private
KylinOrderRefundsMapper
kylinOrderRefundsMapper
;
@Autowired
@Autowired
private
KylinPerformancesMapper
kylinPerformancesMapper
;
private
KylinPerformancesMapper
kylinPerformancesMapper
;
...
@@ -183,15 +188,29 @@ public class KylinRefundPerformancesAdminServiceImpl {
...
@@ -183,15 +188,29 @@ public class KylinRefundPerformancesAdminServiceImpl {
}
}
}
}
public
KylinOrderRefundBatchesVo
detail
(
String
orderRefund
Id
)
{
public
KylinOrderRefundBatchesVo
detail
(
String
refundBatch
Id
)
{
KylinOrderRefundBatches
data
=
kylinOrderRefundBatchesMapper
.
selectOne
(
KylinOrderRefundBatches
data
=
kylinOrderRefundBatchesMapper
.
selectOne
(
new
Update
Wrapper
<
KylinOrderRefundBatches
>()
new
Query
Wrapper
<
KylinOrderRefundBatches
>()
.
eq
(
"refund_batch_id"
,
orderRefund
Id
)
.
eq
(
"refund_batch_id"
,
refundBatch
Id
)
);
);
KylinOrderRefundBatchesVo
kylinOrderRefundBatchesVo
=
new
KylinOrderRefundBatchesVo
();
KylinOrderRefundBatchesVo
kylinOrderRefundBatchesVo
=
new
KylinOrderRefundBatchesVo
();
BeanUtils
.
copyProperties
(
data
,
kylinOrderRefundBatchesVo
);
BeanUtils
.
copyProperties
(
data
,
kylinOrderRefundBatchesVo
);
Integer
totalRefundNum
=
kylinOrderRefundsMapper
.
selectCount
(
new
QueryWrapper
<
KylinOrderRefunds
>()
.
eq
(
"order_refund_batches_id"
,
refundBatchId
)
);
Integer
totalCompleteRefundNum
=
kylinOrderRefundsMapper
.
selectCount
(
new
QueryWrapper
<
KylinOrderRefunds
>()
.
eq
(
"order_refund_batches_id"
,
refundBatchId
)
.
eq
(
"status"
,
KylinTableStatusConst
.
ORDER_REFUND_STATUS_REFUNDED
)
);
kylinOrderRefundBatchesVo
.
setTotalRefundNum
(
totalRefundNum
);
kylinOrderRefundBatchesVo
.
setTotalCompleteRefundNum
(
totalCompleteRefundNum
);
return
kylinOrderRefundBatchesVo
;
return
kylinOrderRefundBatchesVo
;
}
}
...
...
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