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
a13a61f4
Commit
a13a61f4
authored
Aug 02, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sdk升级 & 支付回调清空购物车功能迁移
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
0b87e3be
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletions
+18
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+17
-0
pom.xml
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
a13a61f4
...
@@ -569,6 +569,23 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -569,6 +569,23 @@ public class OrderServiceImpl implements Orderservice {
// fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7
// fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7
newShoppingCartClearDto
.
setBizType
(
orderBean
.
getBizType
());
newShoppingCartClearDto
.
setBizType
(
orderBean
.
getBizType
());
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
/*
主要 根据 ShoppingCartNewServiceImpl 次要 ShoppingCartMallServiceImpl
这里不处理商城
根据sessionId 判断是否是 围餐 , 标准点餐
*/
AssortmentCustomerInfoVo
userLoginInfoDto
=
customerInfoManager
.
getCustomerInfoByObject
(
sessionId
);
if
(
Objects
.
nonNull
(
userLoginInfoDto
))
{
String
iappId
=
userLoginInfoDto
.
getIappId
();
if
(
IappIdType
.
WC_XCX
.
getCode
().
equals
(
iappId
))
{
// 围餐依然调用接口处理
shoppingCartClient
.
clearShoppingCart
(
newShoppingCartClearDto
);
}
else
{
// saas订单, 直接订单服务清空购物车
}
}
}
}
if
(
StringUtils
.
isNotBlank
(
daySeq
)
&&
orderExtInfoDto
!=
null
&&
!
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getType
()))
{
if
(
StringUtils
.
isNotBlank
(
daySeq
)
&&
orderExtInfoDto
!=
null
&&
!
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getType
()))
{
...
...
pom.xml
View file @
a13a61f4
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<lombok.version>
1.16.16
</lombok.version>
<lombok.version>
1.16.16
</lombok.version>
<feign-form.version>
3.0.3
</feign-form.version>
<feign-form.version>
3.0.3
</feign-form.version>
<ordercenter-sdk.version>
1.3.65.RELEASE
</ordercenter-sdk.version>
<ordercenter-sdk.version>
3.1.2-SNAPSHOT
</ordercenter-sdk.version>
</properties>
</properties>
<modules>
<modules>
<module>
ordercenter-sdk
</module>
<module>
ordercenter-sdk
</module>
...
...
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