Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
2a8a050b
Commit
2a8a050b
authored
Sep 02, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠金额只要满减和代金券
parent
05fd6b11
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+2
-4
No files found.
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
View file @
2a8a050b
...
...
@@ -216,10 +216,8 @@ public class DeliveryAdapter {
if
(
CollectionUtils
.
isNotEmpty
(
order
.
getAccountList
()))
{
List
<
CreateDeliveryPreferentialVo
>
createDeliveryPreferentialVos
=
new
ArrayList
<>();
order
.
getAccountList
().
stream
().
forEach
(
accountBean
->
{
if
(!
OldOrderAccountType
.
DELIVERY_AMOUNT
.
getCode
().
equals
(
accountBean
.
getType
())
&&
!
OldOrderAccountType
.
PACK_AMOUNT
.
getCode
().
equals
(
accountBean
.
getType
())
&&
!
OldOrderAccountType
.
CARD_ORIGINAL_AMOUNT
.
getCode
().
equals
(
accountBean
.
getType
())
&&
!
OldOrderAccountType
.
DRIVER_FEE
.
getCode
().
equals
(
accountBean
.
getType
()))
{
if
(
OldOrderAccountType
.
COUPON
.
getCode
().
equals
(
accountBean
.
getType
())
||
OldOrderAccountType
.
BUY_DISCOUNT
.
getCode
().
equals
(
accountBean
.
getType
()))
{
CreateDeliveryPreferentialVo
createDeliveryPreferentialVo
=
new
CreateDeliveryPreferentialVo
();
createDeliveryPreferentialVo
.
setPreferentialContent
(
accountBean
.
getName
());
createDeliveryPreferentialVo
.
setPreferentialPrice
(
0
-
accountBean
.
getPrice
());
...
...
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