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
836a0f88
Commit
836a0f88
authored
Dec 21, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增注释,无代码改动
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
0c207dca
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
3 deletions
+1
-3
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-3
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
836a0f88
...
...
@@ -1869,6 +1869,7 @@ public class OrderAdapter {
return
false
;
}
String
redisKey
=
MessageFormat
.
format
(
OrderRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
partnerId
,
wxAppId
);
// 这里默认是 EAT_IN , 为了兼容后期可能会有改动
String
hashKey
=
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderType
)
?
OrderRedisKeyConstant
.
HashKeyForOrderRefundConfig
.
TAKE_OUT
:
OrderRedisKeyConstant
.
HashKeyForOrderRefundConfig
.
EAT_IN
;;
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
836a0f88
...
...
@@ -3738,10 +3738,7 @@ public class OrderServiceImpl implements Orderservice {
if
(
CollectionUtils
.
isNotEmpty
(
orderBean
.
getRefundList
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
COUPON_ORDER_COMMON_VERIFY_FAIL
.
getCode
(),
"已存在退款申请,请耐心等待处理"
);
}
// fisherman 需要核实一下 是否申请退款,订单主状态还不会变
// fisherman 查询配置是否能退款 未完成
boolean
isTrue
=
orderAdapter
.
checkRefundButtionBizTypeIs6
(
orderBean
.
getCompanyId
(),
orderBean
.
getBizType
(),
orderBean
.
getStatus
(),
userLoginInfoDto
.
getWxAppId
(),
new
Date
(
orderBean
.
getGmtCreate
()),
orderBean
.
getOrderType
());
if
(
isTrue
)
{
...
...
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