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
19d81d18
Commit
19d81d18
authored
Mar 11, 2021
by
ping.wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报错修改
parent
6147e28c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
+3
-3
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
View file @
19d81d18
...
@@ -209,7 +209,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
...
@@ -209,7 +209,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
throw
e
;
throw
e
;
}
finally
{
}
finally
{
//释放锁
//释放锁
RedisLock
.
getInstance
(
redisTemplate
).
unlock
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
CREATERESERVEORDER_LOCKKEY_PREFIX
));
redisTemplate
.
delete
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
CREATERESERVEORDER_LOCKKEY_PREFIX
));
}
}
/**
/**
* 开台成功
* 开台成功
...
@@ -339,7 +339,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
...
@@ -339,7 +339,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
throw
new
ServiceException
(
ResponseResult
.
UPDATE_ORDER_INFO_ERROR
);
throw
new
ServiceException
(
ResponseResult
.
UPDATE_ORDER_INFO_ERROR
);
}
finally
{
}
finally
{
//释放锁
//释放锁
RedisLock
.
getInstance
(
redisTemplate
).
unlock
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
ORDER_PLUS_DISH_LOCKKEY_PREFIX
));
redisTemplate
.
delete
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
ORDER_PLUS_DISH_LOCKKEY_PREFIX
));
try
{
try
{
ShoppingCartBaseResponse
cartBaseResponse
=
shoppingCartClient
.
clearShoppingCart
(
shoppingCartClearDto
);
ShoppingCartBaseResponse
cartBaseResponse
=
shoppingCartClient
.
clearShoppingCart
(
shoppingCartClearDto
);
if
(
cartBaseResponse
==
null
||
ObjectUtils
.
notEqual
(
cartBaseResponse
.
getCode
(),
RESPONSE_SUCCESS_CODE
)){
if
(
cartBaseResponse
==
null
||
ObjectUtils
.
notEqual
(
cartBaseResponse
.
getCode
(),
RESPONSE_SUCCESS_CODE
)){
...
@@ -586,7 +586,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
...
@@ -586,7 +586,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
throw
new
ServiceException
(
ResponseResult
.
PAY_BACKEND_CONFIG_ERROR
);
throw
new
ServiceException
(
ResponseResult
.
PAY_BACKEND_CONFIG_ERROR
);
}
finally
{
}
finally
{
//释放锁
//释放锁
RedisLock
.
getInstance
(
redisTemplate
).
unlock
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
CREATE_PRE_PAYMENTORDER_LOCKKEY_PREFIX
));
redisTemplate
.
delete
(
orderCommonService
.
redisLockInfo
(
assortmentCustomerInfoVo
,
RedisCacheEnum
.
CREATE_PRE_PAYMENTORDER_LOCKKEY_PREFIX
));
if
(
orderResponseVo
!=
null
&&
Objects
.
equals
(
orderResponseVo
.
getPaySuccess
(),
false
)
&&
updateDiscountApportion
)
{
if
(
orderResponseVo
!=
null
&&
Objects
.
equals
(
orderResponseVo
.
getPaySuccess
(),
false
)
&&
updateDiscountApportion
)
{
//记录订单支付状态,防止用户在唤起支付后继续下单,同时也防止重复进行促销计算
//记录订单支付状态,防止用户在唤起支付后继续下单,同时也防止重复进行促销计算
mealCacheManager
.
setOrderCreatePreParmentLock
(
assortmentCustomerInfoVo
.
getPartnerId
(),
assortmentCustomerInfoVo
.
getStoreId
(),
assortmentCustomerInfoVo
.
getTableNumber
());
mealCacheManager
.
setOrderCreatePreParmentLock
(
assortmentCustomerInfoVo
.
getPartnerId
(),
assortmentCustomerInfoVo
.
getStoreId
(),
assortmentCustomerInfoVo
.
getTableNumber
());
...
...
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