记得上下班打卡 | 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
da9de73d
Commit
da9de73d
authored
Jul 19, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成 优先券 对于巡演的拦截
parent
43129153
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
0 deletions
+28
-0
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+4
-0
DataUtils.java
...ain/java/com/liquidnet/service/order/utils/DataUtils.java
+12
-0
OrderUtils.java
...in/java/com/liquidnet/service/order/utils/OrderUtils.java
+12
-0
No files found.
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
da9de73d
...
...
@@ -253,6 +253,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
return
ResponseDto
.
failure
(
"优先券不可用"
);
}
Integer
typeVoucher
=
(
Integer
)
advanceMap
.
get
(
"type"
);
// String couponId = (String) advanceMap.get("couponId");
// if (typeVoucher.equals(-1) || orderUtils.judgeRoadShowCanUse(couponId, performanceData.getRoadShowId())) {
// return ResponseDto.failure("优先券不可用");
// }
if
(
typeVoucher
.
equals
(-
1
))
{
return
ResponseDto
.
failure
(
"优先券不可用"
);
}
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/DataUtils.java
View file @
da9de73d
package
com
.
liquidnet
.
service
.
order
.
utils
;
import
com.liquidnet.common.cache.redis.util.RedisUtil
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.IPUtil
;
import
com.liquidnet.service.adam.dto.vo.AdamEntersVo
;
...
...
@@ -326,4 +327,15 @@ public class DataUtils {
return
(
String
)
obj
;
}
}
//根据 券id 获取 可用巡演id数组
public
List
<
String
>
getCouponRoad
(
String
couponId
)
{
String
rdk
=
KylinRedisConst
.
COUPON_ROADSHOWS
.
concat
(
couponId
);
Object
obj
=
redisUtil
.
get
(
rdk
);
if
(
obj
==
null
)
{
return
CollectionUtil
.
arrayListString
();
}
else
{
return
(
List
<
String
>)
obj
;
}
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java
View file @
da9de73d
...
...
@@ -15,6 +15,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import
com.liquidnet.service.kylin.dao.KylinFreightChargeDao
;
import
com.liquidnet.service.kylin.dto.vo.KylinAgentVo
;
import
com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinCandyVo
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.InnerReturnVo
;
import
com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo
;
...
...
@@ -238,6 +239,7 @@ public class OrderUtils {
});
CandyUseResultVo
candyUseResultVo
=
innerReturnVo
.
getData
();
Integer
type
=
candyUseResultVo
.
getCouType
();
String
couponId
=
candyUseResultVo
.
getCouponId
();
BigDecimal
value
=
candyUseResultVo
.
getValue
();
BigDecimal
voucher
=
BigDecimal
.
ZERO
;
switch
(
type
)
{
...
...
@@ -260,6 +262,7 @@ public class OrderUtils {
voucher
=
BigDecimal
.
ZERO
;
break
;
}
hashMap
.
put
(
"couponId"
,
couponId
);
hashMap
.
put
(
"type"
,
type
);
hashMap
.
put
(
"voucher"
,
voucher
.
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
));
return
hashMap
;
...
...
@@ -272,6 +275,15 @@ public class OrderUtils {
}
}
//判断是不是适用于巡演
public
boolean
judgeRoadShowCanUse
(
String
couponId
,
String
roadShowId
)
{
List
<
String
>
roadShowIds
=
dataUtils
.
getCouponRoad
(
couponId
);
if
(
roadShowIds
.
size
()
==
0
||
roadShowIds
.
contains
(
roadShowId
))
{
return
true
;
}
return
false
;
}
public
void
backAdvanceCoupon
(
String
advanceCode
,
String
uid
)
{
if
(
advanceCode
!=
null
)
{
backCoupon
(
advanceCode
,
uid
);
...
...
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