Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ufo
/
yohoufo-fore
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
Lixiaodi
6 years ago
Commit
6d193328b3eac58be35a2e701e9a1095b82a872e
2 parents
94fa67fe
f41d5a8f
Merge branch 'dev' of
http://git.yoho.cn/ufo/yohoufo-fore
into dev
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
order/src/main/java/com/yohoufo/order/service/cache/CacheCleaner.java
order/src/main/java/com/yohoufo/order/service/impl/SellerOrderService.java
order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
order/src/main/java/com/yohoufo/order/service/cache/CacheCleaner.java
View file @
6d19332
...
...
@@ -41,6 +41,7 @@ public class CacheCleaner {
*/
public
void
delete
(
List
<
RedisKeyBuilder
>
keyBuilders
)
{
try
{
logger
.
info
(
"delete keys {}"
,
keyBuilders
);
redis
.
delete
(
keyBuilders
);
}
catch
(
Exception
ex
)
{
logger
.
warn
(
"call redis delete error,key is {}"
,
keyBuilders
,
ex
);
...
...
order/src/main/java/com/yohoufo/order/service/impl/SellerOrderService.java
View file @
6d19332
...
...
@@ -218,8 +218,8 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
throw
new
ServiceException
(
ServiceError
.
EARNESTMONEY_ORDER_CREATE_FAIL
);
}
boolean
syncPrdFlag
=
productProxyService
.
syncSkup
(
context
.
getSellerOrderGoods
(),
SkupStatus
.
CAN_NOT_SELL
);
log
.
info
(
"publish finish, syncPrdFlag {}, req {}, orderCode {}"
,
syncPrdFlag
,
req
,
orderCode
);
boolean
syncPrdFlag
=
productProxyService
.
syncFullSkup
(
context
.
getSellerOrderGoods
(),
SkupStatus
.
CAN_NOT_SELL
);
log
.
info
(
"publish finish, syncFullSkup {}, req {}, orderCode {}"
,
syncPrdFlag
,
req
,
orderCode
);
//发布支付超时取消消息
pushAutoCancelEvent
(
context
);
...
...
order/src/main/java/com/yohoufo/order/service/proxy/ProductProxyService.java
View file @
6d19332
...
...
@@ -101,7 +101,19 @@ public class ProductProxyService {
return
apiResponse
;
}
public
boolean
syncFullSkup
(
SellerOrderGoods
goods
,
SkupStatus
skupStatus
){
boolean
result
=
false
;
switch
(
skupStatus
){
//一开始未支付时调用
case
CAN_NOT_SELL:
result
=
doSyncSkup
(
goods
,
skupStatus
);
break
;
default
:
logger
.
warn
(
"no no no crazy"
);
break
;
}
return
result
;
}
/**
* 1:可售(支付保证金),2:取消支付保证金,3:超时未支付保证金,4:支付保证金后取消售卖
* @param goods
...
...
@@ -116,8 +128,9 @@ public class ProductProxyService {
switch
(
skupStatus
){
//一开始未支付时调用
case
CAN_NOT_SELL:
result
=
doSyncSkup
(
goods
,
skupStatus
);
return
result
;
//result = doSyncSkup(goods, skupStatus);
logger
.
warn
(
"god cannot save a bad brain"
);
break
;
case
CAN_SELL:
status
=
1
;
break
;
...
...
Please
register
or
login
to post a comment