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
6c9a9c84
Commit
6c9a9c84
authored
Dec 07, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
餐道价格
parent
1344b16f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
3 deletions
+7
-3
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
+7
-3
No files found.
order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java
View file @
6c9a9c84
...
@@ -219,6 +219,8 @@ public class DeliveryAdapter {
...
@@ -219,6 +219,8 @@ public class DeliveryAdapter {
productInfos
.
add
(
deliveryProductInfo
);
productInfos
.
add
(
deliveryProductInfo
);
boolean
isFeiChangDa
=
productList
.
getProductName
().
equalsIgnoreCase
(
"啡常搭"
);
if
(
CollectionUtils
.
isNotEmpty
(
productList
.
getComboProduct
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
productList
.
getComboProduct
()))
{
productList
.
getComboProduct
().
forEach
(
comboProduct
->
{
productList
.
getComboProduct
().
forEach
(
comboProduct
->
{
ProductInfo
deliveryComboProductInfo
=
new
ProductInfo
();
ProductInfo
deliveryComboProductInfo
=
new
ProductInfo
();
...
@@ -251,9 +253,11 @@ public class DeliveryAdapter {
...
@@ -251,9 +253,11 @@ public class DeliveryAdapter {
deliveryComboProductInfo
.
setGrilling
(
grillingCombo
);
deliveryComboProductInfo
.
setGrilling
(
grillingCombo
);
deliveryComboProductInfo
.
setProductName
(
productNameCombo
);
deliveryComboProductInfo
.
setProductName
(
productNameCombo
);
deliveryComboProductInfo
.
setProductNumber
(
comboProduct
.
getNumber
()/
productList
.
getNumber
());
deliveryComboProductInfo
.
setProductNumber
(
comboProduct
.
getNumber
()/
productList
.
getNumber
());
deliveryComboProductInfo
.
setProductPrice
(
comboProduct
.
getSalePrice
().
intValue
());
if
(
isFeiChangDa
)
{
//餐道使用
deliveryComboProductInfo
.
setProductPrice
(
comboProduct
.
getSalePrice
().
intValue
());
deliveryComboProductInfo
.
setCumulatedTotal
(
comboProduct
.
getNumber
()
*
comboProduct
.
getSalePrice
().
intValue
());
//餐道使用
deliveryComboProductInfo
.
setCumulatedTotal
(
comboProduct
.
getNumber
()
*
comboProduct
.
getSalePrice
().
intValue
());
}
OrderProductAddInfoDto
orderComboProductAddInfoDto
=
JSON
.
parseObject
(
comboProduct
.
getAddInfo
(),
OrderProductAddInfoDto
.
class
);
OrderProductAddInfoDto
orderComboProductAddInfoDto
=
JSON
.
parseObject
(
comboProduct
.
getAddInfo
(),
OrderProductAddInfoDto
.
class
);
deliveryComboProductInfo
.
setTaxId
(
StringUtils
.
isNotEmpty
(
orderComboProductAddInfoDto
.
getTaxId
())
?
orderComboProductAddInfoDto
.
getTaxId
()
:
"10"
);
deliveryComboProductInfo
.
setTaxId
(
StringUtils
.
isNotEmpty
(
orderComboProductAddInfoDto
.
getTaxId
())
?
orderComboProductAddInfoDto
.
getTaxId
()
:
"10"
);
deliveryComboProductInfo
.
setTaxRate
(
orderComboProductAddInfoDto
.
getTax
()
>
0
?
orderComboProductAddInfoDto
.
getTax
()
:
6
);
deliveryComboProductInfo
.
setTaxRate
(
orderComboProductAddInfoDto
.
getTax
()
>
0
?
orderComboProductAddInfoDto
.
getTax
()
:
6
);
...
...
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