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
a2f6ce43
Commit
a2f6ce43
authored
Aug 12, 2021
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复key和hkey在sdk中写反的问题
parent
4cf11ffb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+1
-1
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
a2f6ce43
...
@@ -2084,7 +2084,7 @@ public class OrderAdapter {
...
@@ -2084,7 +2084,7 @@ public class OrderAdapter {
// 查询小程序配置的退款设置
// 查询小程序配置的退款设置
boolean
canRefund
=
false
;
boolean
canRefund
=
false
;
String
hkey
=
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getOrderType
())
?
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
:
KgdRedisKeyConstant
.
REFUND_CFG_EAT_IN
;
String
hkey
=
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getOrderType
())
?
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
:
KgdRedisKeyConstant
.
REFUND_CFG_EAT_IN
;
String
configStr
=
redisCache
.
hashGet
(
hkey
,
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
orderBean
.
getCompanyId
(),
wxAppId
)
);
String
configStr
=
redisCache
.
hashGet
(
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
orderBean
.
getCompanyId
(),
wxAppId
),
hkey
);
if
(
StringUtils
.
isEmpty
(
configStr
))
{
if
(
StringUtils
.
isEmpty
(
configStr
))
{
return
true
;
return
true
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
a2f6ce43
...
@@ -1923,7 +1923,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1923,7 +1923,7 @@ public class OrderServiceImpl implements Orderservice {
}
}
}
else
{
}
else
{
// 查询小程序是否配置了退运费
// 查询小程序是否配置了退运费
String
configStr
=
redisCache
.
hashGet
(
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
,
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
orderBean
.
getCompanyId
(),
wxAppId
)
);
String
configStr
=
redisCache
.
hashGet
(
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
orderBean
.
getCompanyId
(),
wxAppId
),
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
);
if
(
StringUtils
.
isNotEmpty
(
configStr
))
{
if
(
StringUtils
.
isNotEmpty
(
configStr
))
{
JSONObject
config
=
JSON
.
parseObject
(
configStr
);
JSONObject
config
=
JSON
.
parseObject
(
configStr
);
String
refundDeliveryFeeConfig
=
config
.
getString
(
OrderRefundEnum
.
REFUND_DELIVERY_FEE_ENABLE
.
getKeyValue
());
String
refundDeliveryFeeConfig
=
config
.
getString
(
OrderRefundEnum
.
REFUND_DELIVERY_FEE_ENABLE
.
getKeyValue
());
...
...
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
View file @
a2f6ce43
...
@@ -563,7 +563,7 @@ public class OrderVerifyHandle {
...
@@ -563,7 +563,7 @@ public class OrderVerifyHandle {
// 查询小程序配置的退款设置
// 查询小程序配置的退款设置
String
hkey
=
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
data
.
getOrderType
())
?
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
:
KgdRedisKeyConstant
.
REFUND_CFG_EAT_IN
;
String
hkey
=
OrderType
.
TAKE_OUT
.
getCode
().
equals
(
data
.
getOrderType
())
?
KgdRedisKeyConstant
.
REFUND_CFG_TAKE_OUT
:
KgdRedisKeyConstant
.
REFUND_CFG_EAT_IN
;
String
configStr
=
redisCache
.
hashGet
(
hkey
,
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
data
.
getCompanyId
(),
extInfo
.
getAppid
())
);
String
configStr
=
redisCache
.
hashGet
(
MessageFormat
.
format
(
KgdRedisKeyConstant
.
ORDER_REFUND_CONFIG
,
data
.
getCompanyId
(),
extInfo
.
getAppid
()),
hkey
);
if
(
StringUtils
.
isEmpty
(
configStr
))
{
if
(
StringUtils
.
isEmpty
(
configStr
))
{
return
true
;
return
true
;
}
}
...
...
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