记得上下班打卡 | 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
afa823a8
Commit
afa823a8
authored
Sep 15, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
批量退款前 先判断演出时候下架
parent
96d2ca8b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
18 deletions
+12
-18
KylinOrderRefundBatchAdminController.java
.../zhengzai/kylin/KylinOrderRefundBatchAdminController.java
+8
-3
applyView.html
...urces/templates/zhengzai/kylin/refundBatch/applyView.html
+4
-4
DataUtils.java
...ain/java/com/liquidnet/service/kylin/utils/DataUtils.java
+0
-11
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundBatchAdminController.java
View file @
afa823a8
...
...
@@ -80,16 +80,21 @@ public class KylinOrderRefundBatchAdminController extends BaseController {
@Log
(
title
=
"演出退款管理"
,
businessType
=
BusinessType
.
OTHER
)
@PostMapping
(
"applyPerformance"
)
@ResponseBody
public
KylinOrderRefundBatchesPerformanceVo
applyPerformance
(
RefundBatchApplyParam
refundBatchApplyParam
)
{
public
AjaxResult
applyPerformance
(
RefundBatchApplyParam
refundBatchApplyParam
)
{
String
performancesId
=
refundBatchApplyParam
.
getTargetId
();
//获取演出详情
KylinPerformanceMisVo
performanceMisVo
=
kylinPerformancesService
.
performanceDetails
(
performancesId
);
if
(
null
==
performanceMisVo
)
{
return
error
(
"未找到该演出数据"
);
}
if
(
performanceMisVo
.
getStatus
()
!=
7
)
{
return
error
(
"当前演出未下架,不可能退款"
);
}
List
<
PerformanceOrderStatisticalDao
>
result
=
kylinPerformancesService
.
getPerformanceOrderStatisticalList
(
performancesId
);
KylinOrderRefundBatchesPerformanceVo
kylinOrderRefundBatchesPerformanceVo
=
new
KylinOrderRefundBatchesPerformanceVo
();
kylinOrderRefundBatchesPerformanceVo
.
setKylinPerformanceMisVo
(
performanceMisVo
);
kylinOrderRefundBatchesPerformanceVo
.
setPerformanceOrderStatisticalDao
(
result
);
return
kylinOrderRefundBatchesPerformanceVo
;
return
AjaxResult
.
success
(
kylinOrderRefundBatchesPerformanceVo
)
;
}
@Log
(
title
=
"演出退款管理"
,
businessType
=
BusinessType
.
APPLY
)
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/applyView.html
View file @
afa823a8
...
...
@@ -56,14 +56,14 @@
$
.
modal
.
loading
(
"正在查询演出,请稍后..."
);
},
success
:
function
(
result
)
{
if
(
result
.
msg
)
{
if
(
result
.
code
>
0
)
{
$
.
modal
.
closeLoading
();
layer
.
msg
(
"未找到该演出信息"
);
layer
.
msg
(
result
.
msg
);
return
false
;
}
$
(
"#performanceTitle"
).
text
(
result
.
kylinPerformanceMisVo
.
title
);
$
(
"#performanceTitle"
).
text
(
result
.
data
.
kylinPerformanceMisVo
.
title
);
var
options
=
{
data
:
result
.
performanceOrderStatisticalDao
,
data
:
result
.
data
.
performanceOrderStatisticalDao
,
pagination
:
false
,
columns
:
[
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @
afa823a8
...
...
@@ -664,17 +664,6 @@ public class DataUtils {
}
}
// 获取订单券的使用情况
public
ArrayList
<
KylinOrderCoupons
>
getOrderCoupon
(
String
orderId
){
String
redisKey
=
KylinRedisConst
.
ORDER_COUPON
.
concat
(
orderId
);
Object
obj
=
redisUtil
.
get
(
redisKey
);
if
(
obj
==
null
)
{
return
new
ArrayList
();
}
else
{
return
(
ArrayList
<
KylinOrderCoupons
>)
obj
;
}
}
/**
* 获取我的演出列表
*/
...
...
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