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
e5b37925
Commit
e5b37925
authored
Oct 16, 2020
by
yu.sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sunyu::update::fix bug about store info check toast msg
parent
d0f1aa9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
+3
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+10
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
View file @
e5b37925
...
...
@@ -60,6 +60,9 @@ public enum ResponseResult {
STORE_NOT_ENABLE_COLLECT_GOODS
(
"43011"
,
"门店不支持到店"
),
STORE_MALL_NOT_FOUND
(
"43012"
,
"商城门店不存在"
),
STORE_DELIVERY_AMOUNT_ERROR
(
"43013"
,
"配送费错误"
),
//麦咖啡专用提示
CART_STORE_CLOSE
(
"43014"
,
"您选择的【$storeName】门店已关闭,请选择其他门店。"
),
CART_STORE_REST
(
"43015"
,
"您选择的【$storeName】门店已打烊,请选择其他门店。"
),
/**
* 购物车状态码
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
e5b37925
...
...
@@ -629,7 +629,9 @@ public class ShoppingCartMCoffeeServiceImpl {
}
BaseResponse
storeCheckResponse
=
checkOrderByStore
(
orderInfo
.
getResult
().
getPartnerId
(),
storeId
,
LogThreadLocal
.
getTrackingNo
());
if
(!
ResponseCodeConstant
.
RESPONSE_SUCCESS_STR
.
equals
(
storeCheckResponse
.
getCode
()))
{
return
storeCheckResponse
;
shoppingCartGoodsResponseVo
.
setChanged
(
true
);
shoppingCartGoodsResponseVo
.
setToastMsg
(
storeCheckResponse
.
getMessage
());
// return storeCheckResponse;
}
List
<
CartGoods
>
cartGoodsList
=
getOrderGoods
(
orderInfo
.
getResult
());
...
...
@@ -665,13 +667,18 @@ public class ShoppingCartMCoffeeServiceImpl {
return
ResponseUtil
.
error
(
ResponseResult
.
STORE_NOT_FOUND
);
}
StoreResponse
.
BizVO
storeResponseDto
=
storeResponse
.
getBizVO
();
String
storeName
=
storeResponseDto
.
getStoreName
();
// 校验门店是否营业
if
(
storeResponseDto
.
getActiveFlag
()
==
null
||
storeResponseDto
.
getActiveFlag
()
!=
1
||
storeResponseDto
.
getState
()
==
null
||
storeResponseDto
.
getState
().
equals
(
"3"
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
STORE_ITEM_STOP_BUSINESS
);
ResponseResult
storeClose
=
ResponseResult
.
CART_STORE_CLOSE
;
storeClose
.
getMessage
().
replace
(
"$storeName"
,
storeName
);
return
ResponseUtil
.
error
(
storeClose
);
}
if
(
storeResponseDto
.
getActiveFlag
()
==
1
&&
storeResponseDto
.
getState
().
equals
(
"2"
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
STORE_ITEM_CHECK_CLOSE
);
ResponseResult
storeRest
=
ResponseResult
.
CART_STORE_REST
;
storeRest
.
getMessage
().
replace
(
"$storeName"
,
storeName
);
return
ResponseUtil
.
error
(
ResponseResult
.
CART_STORE_REST
);
}
return
ResponseUtil
.
success
();
}
...
...
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