Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
0c395dc3
Commit
0c395dc3
authored
Sep 20, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改优惠券bug
parent
b4301c95
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+1
-1
OrderTourService.java
...ava/com/xxfc/platform/order/service/OrderTourService.java
+1
-1
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
0c395dc3
...
@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -313,7 +313,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
List
<
String
>
usedTickerNos
=
CollUtil
.
newArrayList
();
List
<
String
>
usedTickerNos
=
CollUtil
.
newArrayList
();
for
(
String
no
:
detail
.
getTickerNo
())
{
for
(
String
no
:
detail
.
getTickerNo
())
{
BigDecimal
tempCouponAmount
=
activityFeign
.
use
(
dto
.
getUserid
(),
CollUtil
.
newArrayList
(
no
),
detail
.
getOrder
().
getNo
(),
channel
,
vehicleAmount
,
ActivityFeign
.
TYPE_NO_USE
);
BigDecimal
tempCouponAmount
=
activityFeign
.
use
(
dto
.
getUserid
(),
CollUtil
.
newArrayList
(
no
),
detail
.
getOrder
().
getNo
(),
channel
,
vehicleAmount
,
ActivityFeign
.
TYPE_NO_USE
);
if
(
c
ouponAmount
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
if
(
tempC
ouponAmount
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
//加入总couponAmount
//加入总couponAmount
couponAmount
=
couponAmount
.
add
(
tempCouponAmount
);
couponAmount
=
couponAmount
.
add
(
tempCouponAmount
);
usedTickerNos
.
add
(
no
);
usedTickerNos
.
add
(
no
);
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java
View file @
0c395dc3
...
@@ -255,7 +255,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
...
@@ -255,7 +255,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
List
<
String
>
usedTickerNos
=
CollUtil
.
newArrayList
();
List
<
String
>
usedTickerNos
=
CollUtil
.
newArrayList
();
for
(
String
no
:
detail
.
getTickerNo
())
{
for
(
String
no
:
detail
.
getTickerNo
())
{
BigDecimal
tempCouponAmount
=
activityFeign
.
use
(
dto
.
getUserid
(),
CollUtil
.
newArrayList
(
no
),
detail
.
getOrder
().
getNo
(),
channel
,
tourAmount
,
ActivityFeign
.
TYPE_NO_USE
);
BigDecimal
tempCouponAmount
=
activityFeign
.
use
(
dto
.
getUserid
(),
CollUtil
.
newArrayList
(
no
),
detail
.
getOrder
().
getNo
(),
channel
,
tourAmount
,
ActivityFeign
.
TYPE_NO_USE
);
if
(
c
ouponAmount
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
if
(
tempC
ouponAmount
.
compareTo
(
BigDecimal
.
ZERO
)
>
0
)
{
//加入总couponAmount
//加入总couponAmount
couponAmount
=
couponAmount
.
add
(
tempCouponAmount
);
couponAmount
=
couponAmount
.
add
(
tempCouponAmount
);
usedTickerNos
.
add
(
no
);
usedTickerNos
.
add
(
no
);
...
...
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