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
0faa424a
Commit
0faa424a
authored
Oct 08, 2020
by
huiyang.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 注释
parent
2a7360e0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
+2
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
View file @
0faa424a
...
@@ -295,7 +295,7 @@ public class CalculationServiceImpl {
...
@@ -295,7 +295,7 @@ public class CalculationServiceImpl {
*/
*/
private
Long
calculateDeliveryAmount
(
String
receiveId
,
String
partnerId
,
String
storeId
,
String
menuType
)
{
private
Long
calculateDeliveryAmount
(
String
receiveId
,
String
partnerId
,
String
storeId
,
String
menuType
)
{
Long
deliveryAmount
=
1000
l
;
Long
deliveryAmount
=
1000
l
;
/*
if (StringUtils.isBlank(receiveId) || !BusinessTypeEnum.SAAS_DELIVERY.getCode().equals(menuType)) {
if
(
StringUtils
.
isBlank
(
receiveId
)
||
!
BusinessTypeEnum
.
SAAS_DELIVERY
.
getCode
().
equals
(
menuType
))
{
return
deliveryAmount
;
return
deliveryAmount
;
}
}
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
String
trackingNo
=
LogThreadLocal
.
getTrackingNo
();
...
@@ -319,7 +319,7 @@ public class CalculationServiceImpl {
...
@@ -319,7 +319,7 @@ public class CalculationServiceImpl {
// throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
// throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
// }
// }
Double
deliveryPrice
=
storeInfo
.
getBizVO
().
getDeliveryPrice
()*
100
;
Double
deliveryPrice
=
storeInfo
.
getBizVO
().
getDeliveryPrice
()*
100
;
deliveryAmount = deliveryPrice.longValue();
*/
deliveryAmount
=
deliveryPrice
.
longValue
();
return
deliveryAmount
;
return
deliveryAmount
;
}
}
...
...
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