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
Email Patches
Plain Diff
Browse Files
Authored by
chenchao
5 years ago
Commit
5f68154874747296870d164c4faea881b36aafa7
1 parent
34cdae9a
支持薅羊毛取消退卖家券
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
2 deletions
order/src/main/java/com/yohoufo/order/common/ActionStatusHold.java
order/src/main/java/com/yohoufo/order/service/handler/BuyerRefundCouponAsyncHandler.java
order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderCancelService.java
web/src/main/webapp/html/h5Share/js/.DS_Store
order/src/main/java/com/yohoufo/order/common/ActionStatusHold.java
View file @
5f68154
...
...
@@ -280,7 +280,8 @@ public class ActionStatusHold {
OrderStatus
.
MINI_FAULT_REJECT
.
getCode
(),
OrderStatus
.
MINI_FAULT_OUT_TIME_REJECT
.
getCode
(),
OrderStatus
.
PLATFORM_APPRAISE_UNSURE
.
getCode
(),
OrderStatus
.
PLATFORM_DETECTION_NOT_PASS
.
getCode
()
OrderStatus
.
PLATFORM_DETECTION_NOT_PASS
.
getCode
(),
OrderStatus
.
PLATFORM_CANCEL_OF_BUYER_PULL_WOOL
.
getCode
()
);
}
...
...
order/src/main/java/com/yohoufo/order/service/handler/BuyerRefundCouponAsyncHandler.java
View file @
5f68154
...
...
@@ -6,7 +6,6 @@ import com.yohoufo.order.event.BuyerRefundCouponEvent;
import
com.yohoufo.order.service.impl.BuyerOrderCancelService
;
import
com.yohoufo.order.utils.LoggerUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
...
...
order/src/main/java/com/yohoufo/order/service/impl/BuyerOrderCancelService.java
View file @
5f68154
...
...
@@ -442,6 +442,7 @@ public class BuyerOrderCancelService {
int
rows
=
buyerOrderMapper
.
updateStatusWithStatusList
(
orderCode
,
targetStatus
.
getCode
(),
statusList
,
DateUtil
.
getCurrentTimeSecond
());
logger
.
info
(
"in buyer order cancelByCS because pull wool, req {} updateStatusWithStatusList {}"
,
request
,
rows
);
if
(
rows
>
0
)
{
asyncRefundSellerCoupon
(
pbo
.
getOrderCode
(),
targetStatus
,
preparedData
.
getSellerOrderGoods
());
asyncProcessPenalty
(
preparedData
,
targetStatus
);
//clean cache
cacheCleaner
.
cleanSellerAndBuyerOrderDetailAndList
(
pbo
.
getSellerUid
(),
pbo
.
getUid
(),
orderCode
);
...
...
web/src/main/webapp/html/h5Share/js/.DS_Store
deleted
100644 → 0
View file @
34cdae9
No preview for this file type
Please
register
or
login
to post a comment