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
6b5a2652
Commit
6b5a2652
authored
Mar 24, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据太一配置修改
parent
e8a65b9d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-3
order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
6b5a2652
...
...
@@ -133,6 +133,8 @@ public class OrderAdapter {
private
String
withOrderBuyCouponCode
;
@Value
(
"${pay.turnoff.refund}"
)
private
String
payTurnoffRefund
=
"0"
;
@Value
(
"${pay.turnoff.refund.partnerId}"
)
private
String
payTurnoffRefundPartnerId
=
"0"
;
/**
* coco商户
...
...
@@ -1427,7 +1429,7 @@ public class OrderAdapter {
responseVo
.
setProgress
(
ordersBean
.
getProgress
());
responseVo
.
setQueueIndex
(
ordersBean
.
getQueueIndex
());
responseVo
.
setOrderProgressBarStatus
(
ordersBean
.
getOrderProgressBarStatus
());
responseVo
.
setPayTurnoffRefund
(
getPayTurnoffRefund
(
ordersBean
));
responseVo
.
setPayTurnoffRefund
(
getPayTurnoffRefund
());
list
.
add
(
responseVo
);
});
return
list
;
...
...
@@ -4128,9 +4130,9 @@ public class OrderAdapter {
/**
* 获取是否支持订单退款
*/
public
String
getPayTurnoffRefund
(
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
){
public
String
getPayTurnoffRefund
(){
try
{
AssortmentOpenPlatformPartnerConfig
assortmentOpenPlatformPartnerConfig
=
assortmentOpenPlatformPartnerConfigManager
.
selectPartnerConfigByPartnerKey
(
orderBean
.
getCompanyId
()
,
RedisKeyConstant
.
PARTNER_PAY_TURNOFF_REFUND
,
1
);
AssortmentOpenPlatformPartnerConfig
assortmentOpenPlatformPartnerConfig
=
assortmentOpenPlatformPartnerConfigManager
.
selectPartnerConfigByPartnerKey
(
payTurnoffRefundPartnerId
,
RedisKeyConstant
.
PARTNER_PAY_TURNOFF_REFUND
,
1
);
if
(
null
!=
assortmentOpenPlatformPartnerConfig
)
{
payTurnoffRefund
=
assortmentOpenPlatformPartnerConfig
.
getPartnerValue
();
}
...
...
order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java
View file @
6b5a2652
...
...
@@ -116,7 +116,7 @@ public class MallOrderServiceImplTest {
public
void
test
()
{
String
payTurnoffRefund
=
"0"
;
try
{
AssortmentOpenPlatformPartnerConfig
assortmentOpenPlatformPartnerConfig
=
assortmentOpenPlatformPartnerConfigManager
.
selectPartnerConfigByPartnerKey
(
"
2239
"
,
RedisKeyConstant
.
PARTNER_PAY_TURNOFF_REFUND
,
1
);
AssortmentOpenPlatformPartnerConfig
assortmentOpenPlatformPartnerConfig
=
assortmentOpenPlatformPartnerConfigManager
.
selectPartnerConfigByPartnerKey
(
"
0
"
,
RedisKeyConstant
.
PARTNER_PAY_TURNOFF_REFUND
,
1
);
if
(
null
!=
assortmentOpenPlatformPartnerConfig
)
{
payTurnoffRefund
=
assortmentOpenPlatformPartnerConfig
.
getPartnerValue
();
}
...
...
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