记得上下班打卡 | 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
5140346e
Commit
5140346e
authored
Nov 16, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
isBackPaperTicket 快递票是否需要退回配置
parent
730f1b4b
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
6 deletions
+36
-6
PerformanceRefundConfigVo.java
...service/kylin/dto/vo/admin/PerformanceRefundConfigVo.java
+1
-0
KylinPerformanceVo.java
...uidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
+2
-0
IKylinPerformancesAdminService.java
...e/kylin/service/admin/IKylinPerformancesAdminService.java
+3
-1
KylinPerformancesController.java
...ontroller/zhengzai/kylin/KylinPerformancesController.java
+4
-2
refundConfig.html
...s/templates/zhengzai/kylin/performances/refundConfig.html
+13
-1
KylinPerformancesAdminServiceImpl.java
...kylin/service/impl/KylinPerformancesAdminServiceImpl.java
+5
-1
KylinPerformanceStatus.java
...iquidnet/service/kylin/entity/KylinPerformanceStatus.java
+5
-0
db_kylin_20211115_express_refund.sql
...vice-kylin-impl/docu/db_kylin_20211115_express_refund.sql
+3
-1
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceRefundConfigVo.java
View file @
5140346e
...
...
@@ -17,6 +17,7 @@ public class PerformanceRefundConfigVo {
private
Integer
isRefundPoundage
;
private
Integer
isRefundVoucher
;
private
Integer
isRefundExpress
;
private
Integer
isBackPaperTicket
;
private
OrderRefundAddress
orderRefundAddress
;
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
View file @
5140346e
...
...
@@ -119,6 +119,7 @@ public class KylinPerformanceVo {
private
Integer
isRefundPoundage
;
private
Integer
isRefundVoucher
;
private
Integer
isRefundExpress
;
private
Integer
isBackPaperTicket
;
public
void
setPerformance
(
KylinPerformances
performance
)
{
this
.
mid
=
performance
.
getMid
();
...
...
@@ -175,6 +176,7 @@ public class KylinPerformanceVo {
this
.
isRefundPoundage
=
performanceStatus
.
getIsRefundPoundage
();
this
.
isRefundVoucher
=
performanceStatus
.
getIsRefundVoucher
();
this
.
isRefundExpress
=
performanceStatus
.
getIsRefundExpress
();
this
.
isBackPaperTicket
=
performanceStatus
.
getIsBackPaperTicket
();
}
public
void
setPerformanceRelations
(
KylinPerformanceRelations
performanceRelations
)
{
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @
5140346e
...
...
@@ -199,7 +199,9 @@ public interface IKylinPerformancesAdminService {
String
refundCloseTime
,
Integer
isRefundPoundage
,
Integer
isRefundVoucher
,
Integer
isRefundExpress
);
Integer
isRefundExpress
,
Integer
isBackPaperTicket
);
/**
* 获取 演出转赠配置
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @
5140346e
...
...
@@ -203,8 +203,10 @@ public class KylinPerformancesController extends BaseController {
@RequestParam
(
"refundCloseTime"
)
String
refundCloseTime
,
@RequestParam
(
"isRefundPoundage"
)
Integer
isRefundPoundage
,
@RequestParam
(
"isRefundVoucher"
)
Integer
isRefundVoucher
,
@RequestParam
(
"isRefundExpress"
)
Integer
isRefundExpress
)
{
String
result
=
kylinPerformancesService
.
changeRefundConfig
(
performancesId
,
isCanRefund
,
refundOpenTime
,
refundCloseTime
,
isRefundPoundage
,
isRefundVoucher
,
isRefundExpress
);
@RequestParam
(
"isRefundExpress"
)
Integer
isRefundExpress
,
@RequestParam
(
"isBackPaperTicket"
)
Integer
isBackPaperTicket
)
{
String
result
=
kylinPerformancesService
.
changeRefundConfig
(
performancesId
,
isCanRefund
,
refundOpenTime
,
refundCloseTime
,
isRefundPoundage
,
isRefundVoucher
,
isRefundExpress
,
isBackPaperTicket
);
return
this
.
success
(
result
);
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html
View file @
5140346e
...
...
@@ -95,6 +95,17 @@
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
快递票是否需要退回:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"radio check-box"
>
<input
type=
"radio"
value=
"0"
name=
"isBackPaperTicket"
th:checked=
"*{isBackPaperTicket==0 ? true : false}"
checked
>
不需要
</label>
</div>
<div
class=
"radio check-box"
>
<input
type=
"radio"
value=
"1"
name=
"isBackPaperTicket"
th:checked=
"*{isBackPaperTicket==1 ? true : false}"
>
需要
</label>
</div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
收货人:
</label>
<div
class=
"col-sm-8"
>
...
...
@@ -156,7 +167,8 @@
refundCloseTime
:
$
(
"input[name^='refundCloseTime']"
).
val
(),
isRefundPoundage
:
parseInt
(
$
(
"input[name^='performance_isRefundPoundage']:checked"
).
val
()),
isRefundVoucher
:
parseInt
(
$
(
"input[name^='performance_isRefundVoucher']:checked"
).
val
()),
isRefundExpress
:
parseInt
(
$
(
"input[name^='performance_isRefundExpress']:checked"
).
val
())
isRefundExpress
:
parseInt
(
$
(
"input[name^='performance_isRefundExpress']:checked"
).
val
()),
isBackPaperTicket
:
parseInt
(
$
(
"input[name^='isBackPaperTicket']:checked"
).
val
())
}
if
(
$
(
"input[name^='refundCloseTime']"
).
val
()
==
""
||
$
(
"input[name^='refundOpenTime']"
).
val
()
==
""
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @
5140346e
...
...
@@ -586,6 +586,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
vo
.
setIsRefundPoundage
(
kylinPerformanceStatus
.
getIsRefundPoundage
());
vo
.
setIsRefundVoucher
(
kylinPerformanceStatus
.
getIsRefundVoucher
());
vo
.
setIsRefundExpress
(
kylinPerformanceStatus
.
getIsRefundExpress
());
vo
.
setIsBackPaperTicket
(
kylinPerformanceStatus
.
getIsBackPaperTicket
());
vo
.
setOrderRefundAddress
(
dataUtils
.
getRefundAddress
());
return
vo
;
...
...
@@ -646,7 +647,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
String
refundCloseTime
,
Integer
isRefundPoundage
,
Integer
isRefundVoucher
,
Integer
isRefundExpress
)
{
Integer
isRefundExpress
,
Integer
isBackPaperTicket
)
{
KylinPerformanceStatus
kylinPerformanceStatusData
=
performanceStatusMapper
.
selectOne
(
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
performancesId
));
if
(
kylinPerformanceStatusData
.
getIsTransfer
().
equals
(
1
)
&&
isCanRefund
.
equals
(
1
))
{
return
"修改失败,演出已开启转赠"
;
...
...
@@ -659,6 +662,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
kylinPerformanceStatus
.
setIsRefundPoundage
(
isRefundPoundage
);
kylinPerformanceStatus
.
setIsRefundVoucher
(
isRefundVoucher
);
kylinPerformanceStatus
.
setIsRefundExpress
(
isRefundExpress
);
kylinPerformanceStatus
.
setIsBackPaperTicket
(
isBackPaperTicket
);
try
{
performanceStatusMapper
.
update
(
kylinPerformanceStatus
,
new
UpdateWrapper
<
KylinPerformanceStatus
>().
eq
(
"performance_id"
,
performancesId
));
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java
View file @
5140346e
...
...
@@ -139,6 +139,11 @@ public class KylinPerformanceStatus implements Serializable ,Cloneable{
*/
private
Integer
isRefundExpress
;
/**
* 快递票是否需要退回
*/
private
Integer
isBackPaperTicket
;
/**
* 创建时间
*/
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_20211115_express_refund.sql
View file @
5140346e
...
...
@@ -17,4 +17,6 @@ CREATE TABLE `kylin_express_module`
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
utf8mb4
COLLATE
utf8mb4_unicode_ci
ROW_FORMAT
=
DYNAMIC
COMMENT
'快递模板表'
;
\ No newline at end of file
ROW_FORMAT
=
DYNAMIC
COMMENT
'快递模板表'
;
alter
table
kylin_performance_status
add
is_back_paper_ticket
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'快递票是否需要退回 0不需要 1需要'
after
is_refund_express
;
\ No newline at end of file
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