记得上下班打卡 | 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
a30eea66
Commit
a30eea66
authored
Oct 13, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3天内改成不支持退票 增加特别说明
parent
09956138
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
7 deletions
+67
-7
KylinRedisConst.java
...com/liquidnet/service/kylin/constant/KylinRedisConst.java
+1
-0
OrderRefundPoundage.java
...idnet/service/kylin/dto/vo/admin/OrderRefundPoundage.java
+6
-3
OrderRefundPoundageAll.java
...et/service/kylin/dto/vo/admin/OrderRefundPoundageAll.java
+35
-0
KylinOrderTicketPreVo.java
...t/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java
+2
-1
KylinOrderTicketsRefundServiceImpl.java
...ylin/service/impl/KylinOrderTicketsRefundServiceImpl.java
+3
-2
DataUtils.java
...ain/java/com/liquidnet/service/kylin/utils/DataUtils.java
+20
-1
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java
View file @
a30eea66
...
...
@@ -36,6 +36,7 @@ public class KylinRedisConst {
public
static
final
String
ORDER_REFUND_ADDRESS
=
"kylin:order:refund:address"
;
// 手续费
public
static
final
String
ORDER_REFUND_POUNDAGE
=
"kylin:order:poundage"
;
public
static
final
String
ORDER_REFUND_POUNDAGE_EXPLAIN
=
"kylin:order:poundageExplain"
;
public
static
final
String
USERID_BUY_INFO
=
"kylin:buy:userId:"
;
public
static
final
String
IDCARD_BUY_INFO
=
"kylin:buy:idCard:"
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/OrderRefundPoundage.java
View file @
a30eea66
...
...
@@ -6,9 +6,12 @@ import lombok.Data;
import
java.math.BigDecimal
;
/**
* @version V1.0
* @class: OrderRefundPoundage
* @Copyright: LightNet @ Copyright (c) 2021
* <p>
* 退款手续费说明
* </p>
*
* @author jiangxiulong
* @since 2021-10-13
*/
@Data
public
class
OrderRefundPoundage
implements
Cloneable
{
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/OrderRefundPoundageAll.java
0 → 100644
View file @
a30eea66
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
admin
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.List
;
/**
* <p>
* 退款手续费说明
* </p>
*
* @author jiangxiulong
* @since 2021-10-13
*/
@Data
public
class
OrderRefundPoundageAll
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
5077177070181399707L
;
@ApiModelProperty
(
value
=
"特殊说明"
)
private
String
explain
;
@ApiModelProperty
(
value
=
"手续费列表"
)
private
List
<
OrderRefundPoundage
>
orderRefundPoundageList
;
private
static
final
OrderRefundPoundageAll
obj
=
new
OrderRefundPoundageAll
();
public
static
OrderRefundPoundageAll
getNew
()
{
try
{
return
(
OrderRefundPoundageAll
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
OrderRefundPoundageAll
();
}
}
}
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderTicketPreVo.java
View file @
a30eea66
package
com
.
liquidnet
.
service
.
kylin
.
dto
.
vo
.
returns
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
import
com.liquidnet.service.kylin.entity.KylinOrderTicketRelations
;
import
com.liquidnet.service.kylin.entity.KylinOrderTicketStatus
;
...
...
@@ -89,7 +90,7 @@ public class KylinOrderTicketPreVo implements Serializable, Cloneable {
private
Integer
isRefundExpress
;
@ApiModelProperty
(
value
=
"手续费规则列表"
)
private
ArrayList
<
OrderRefundPoundage
>
refundPoundageList
;
private
OrderRefundPoundageAll
refundPoundageAll
;
@ApiModelProperty
(
value
=
"订单使用优惠券列表"
)
private
ArrayList
<
KylinOrderCoupons
>
orderCouponList
;
@ApiModelProperty
(
value
=
"退款快递统一寄回地址"
)
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java
View file @
a30eea66
...
...
@@ -9,6 +9,7 @@ import com.liquidnet.service.base.constant.MQConst;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll
;
import
com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
...
...
@@ -117,7 +118,7 @@ public class KylinOrderTicketsRefundServiceImpl {
orderTicketVo
.
setOrderCode
(
orderTicketVo
.
getOrderCode
().
substring
(
orderTicketVo
.
getOrderCode
().
length
()
-
10
));
}
// 手续费相关
ArrayList
<
OrderRefundPoundage
>
refundPoundage
=
dataUtils
.
getRefundPoundage
(
performanceVo
.
getIsRefundPoundage
());
OrderRefundPoundageAll
refundPoundageAll
=
dataUtils
.
getRefundPoundageAll
(
performanceVo
.
getIsRefundPoundage
());
// 券
ArrayList
<
KylinOrderCoupons
>
orderCoupon
=
dataUtils
.
getOrderCoupon
(
orderId
);
// 快递地址
...
...
@@ -126,7 +127,7 @@ public class KylinOrderTicketsRefundServiceImpl {
BeanUtils
.
copyProperties
(
orderTicketVo
,
vo
);
vo
.
setIsRefundPoundage
(
performanceVo
.
getIsRefundPoundage
());
vo
.
setIsRefundVoucher
(
performanceVo
.
getIsRefundVoucher
());
vo
.
setRefundPoundage
List
(
refundPoundage
);
vo
.
setRefundPoundage
All
(
refundPoundageAll
);
vo
.
setOrderCouponList
(
orderCoupon
);
vo
.
setRefundAddress
(
refundAddress
);
vo
.
setIsTrueName
(
performanceVo
.
getIsTrueName
());
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @
a30eea66
...
...
@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import
com.liquidnet.service.kylin.constant.KylinTableStatusConst
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage
;
import
com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundageAll
;
import
com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressRouteVo
;
import
com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.*
;
...
...
@@ -716,7 +717,7 @@ public class DataUtils {
vo3
.
setDay
(
0
);
vo3
.
setContent
(
"距离演出开始日期≤3天(含演出当天)"
);
vo3
.
setPresent
(
BigDecimal
.
valueOf
(
1
));
vo3
.
setIsCanRefund
(
1
);
vo3
.
setIsCanRefund
(
0
);
orderRefundPoundageArrayList
.
add
(
vo1
);
orderRefundPoundageArrayList
.
add
(
vo2
);
orderRefundPoundageArrayList
.
add
(
vo3
);
...
...
@@ -729,6 +730,24 @@ public class DataUtils {
return
orderRefundPoundageArrayList
;
}
}
// 获取手续费ALL说明
public
OrderRefundPoundageAll
getRefundPoundageAll
(
Integer
isRefundPoundage
)
{
ArrayList
<
OrderRefundPoundage
>
refundPoundage
=
getRefundPoundage
(
isRefundPoundage
);
OrderRefundPoundageAll
aNew
=
OrderRefundPoundageAll
.
getNew
();
aNew
.
setOrderRefundPoundageList
(
refundPoundage
);
Object
obj
=
redisUtil
.
get
(
KylinRedisConst
.
ORDER_REFUND_POUNDAGE_EXPLAIN
);
if
(
null
==
obj
)
{
String
explain
=
"1.存在异常订购行为的订单,平台有权不予办理退票。\n2.不支持退票示例:如演出时间为5月1日,则不支持退票的时间范围为4月28日-30日及5月1日(演出当天)。"
;
redisUtil
.
set
(
KylinRedisConst
.
ORDER_REFUND_POUNDAGE_EXPLAIN
,
explain
);
aNew
.
setExplain
(
explain
);
}
else
{
String
explain
=
(
String
)
obj
;
aNew
.
setExplain
(
explain
);
}
return
aNew
;
}
// 获取订单券的使用情况
public
ArrayList
<
KylinOrderCoupons
>
getOrderCoupon
(
String
orderId
)
{
...
...
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