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
3942d890
Commit
3942d890
authored
Sep 14, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
删除无效 日志
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
95e7d134
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
4 deletions
+0
-4
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+0
-3
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+0
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
3942d890
...
@@ -184,7 +184,6 @@ public class OrderAdapter {
...
@@ -184,7 +184,6 @@ public class OrderAdapter {
ArrayList
<
CreateOrderAccountRequest
>
orderAccountDtos
=
new
ArrayList
<>();
ArrayList
<
CreateOrderAccountRequest
>
orderAccountDtos
=
new
ArrayList
<>();
long
deliveryAmount
=
0
;
long
deliveryAmount
=
0
;
long
discountDeliveryAmount
=
0
;
long
discountDeliveryAmount
=
0
;
AppLogUtil
.
infoLog
(
"fisherman 计算discountDeliveryAmount 的操作 begin"
,
shoppingCartGoodsDto
,
createOrderVo
);
if
(
createOrderVo
.
getMenuType
().
equals
(
BusinessTypeEnum
.
SAAS_DELIVERY
.
getCode
()))
{
if
(
createOrderVo
.
getMenuType
().
equals
(
BusinessTypeEnum
.
SAAS_DELIVERY
.
getCode
()))
{
deliveryAmount
=
shoppingCartGoodsDto
.
getDeliveryAmount
()
==
null
?
9
l
:
shoppingCartGoodsDto
.
getDeliveryAmount
();
deliveryAmount
=
shoppingCartGoodsDto
.
getDeliveryAmount
()
==
null
?
9
l
:
shoppingCartGoodsDto
.
getDeliveryAmount
();
discountDeliveryAmount
=
shoppingCartGoodsDto
.
getDeliveryAmount
()
==
null
?
9
l
:
shoppingCartGoodsDto
.
getDeliveryAmount
();
discountDeliveryAmount
=
shoppingCartGoodsDto
.
getDeliveryAmount
()
==
null
?
9
l
:
shoppingCartGoodsDto
.
getDeliveryAmount
();
...
@@ -211,7 +210,6 @@ public class OrderAdapter {
...
@@ -211,7 +210,6 @@ public class OrderAdapter {
Long
totalScore
=
shoppingCartGoodsDto
.
getTotalScore
()
==
null
?
0L
:
shoppingCartGoodsDto
.
getTotalScore
();
Long
totalScore
=
shoppingCartGoodsDto
.
getTotalScore
()
==
null
?
0L
:
shoppingCartGoodsDto
.
getTotalScore
();
createOrderDto
.
setTotalScore
(
totalScore
);
createOrderDto
.
setTotalScore
(
totalScore
);
AppLogUtil
.
infoLog
(
"fisherman 计算discountDeliveryAmount 的操作 end"
,
deliveryAmount
,
discountDeliveryAmount
);
//商城实付无需加上配送费用和包装费
//商城实付无需加上配送费用和包装费
if
(
createOrderVo
.
getMenuType
().
equals
(
BusinessTypeEnum
.
SAAS_MALL
.
getCode
()))
{
if
(
createOrderVo
.
getMenuType
().
equals
(
BusinessTypeEnum
.
SAAS_MALL
.
getCode
()))
{
createOrderDto
.
setAmount
(
shoppingCartGoodsDto
.
getTotalAmount
());
createOrderDto
.
setAmount
(
shoppingCartGoodsDto
.
getTotalAmount
());
...
@@ -1568,7 +1566,6 @@ public class OrderAdapter {
...
@@ -1568,7 +1566,6 @@ public class OrderAdapter {
list
.
add
(
responseVo
);
list
.
add
(
responseVo
);
}
}
AppLogUtil
.
infoLog
(
"fisherman orderBean:"
,
JSON
.
toJSONString
(
ordersBeans
),
JSON
.
toJSONString
(
list
));
return
list
;
return
list
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
View file @
3942d890
...
@@ -1058,7 +1058,6 @@ public class CheckOrder {
...
@@ -1058,7 +1058,6 @@ public class CheckOrder {
request
.
setPartnerId
(
partnerId
);
request
.
setPartnerId
(
partnerId
);
request
.
setStoreCode
(
storeCode
);
request
.
setStoreCode
(
storeCode
);
StoreCBaseResponse
<
StoreCBaseResponseDto
>
responseDto
=
storeBaseApiClient
.
queryDeliverDetail
(
request
);
StoreCBaseResponse
<
StoreCBaseResponseDto
>
responseDto
=
storeBaseApiClient
.
queryDeliverDetail
(
request
);
AppLogUtil
.
infoLog
(
"fisherman 获取门店预计送达时间"
,
request
,
responseDto
);
if
(
responseDto
==
null
)
{
if
(
responseDto
==
null
)
{
throw
new
ServiceException
(
ResponseResult
.
SYSTEM_BUSINESS_ERROR
);
throw
new
ServiceException
(
ResponseResult
.
SYSTEM_BUSINESS_ERROR
);
}
}
...
...
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