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
ce908ae1
Commit
ce908ae1
authored
Mar 23, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加是否展示可退款字段
parent
ebfb86ad
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
0 deletions
+35
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+20
-0
order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java
+10
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+5
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
ce908ae1
...
@@ -15,6 +15,7 @@ package cn.freemud.adapter;
...
@@ -15,6 +15,7 @@ package cn.freemud.adapter;
import
cn.freemud.base.log.LogTreadLocal
;
import
cn.freemud.base.log.LogTreadLocal
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.base.util.DateUtil
;
import
cn.freemud.constant.CustomerScoreConstant
;
import
cn.freemud.constant.CustomerScoreConstant
;
import
cn.freemud.constant.RedisKeyConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.constant.ResponseCodeConstant
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.*
;
import
cn.freemud.entities.dto.activity.ShareDiscountActivityDto
;
import
cn.freemud.entities.dto.activity.ShareDiscountActivityDto
;
...
@@ -1419,6 +1420,7 @@ public class OrderAdapter {
...
@@ -1419,6 +1420,7 @@ public class OrderAdapter {
responseVo
.
setProgress
(
ordersBean
.
getProgress
());
responseVo
.
setProgress
(
ordersBean
.
getProgress
());
responseVo
.
setQueueIndex
(
ordersBean
.
getQueueIndex
());
responseVo
.
setQueueIndex
(
ordersBean
.
getQueueIndex
());
responseVo
.
setOrderProgressBarStatus
(
ordersBean
.
getOrderProgressBarStatus
());
responseVo
.
setOrderProgressBarStatus
(
ordersBean
.
getOrderProgressBarStatus
());
responseVo
.
setPayTurnoffRefund
(
getPayTurnoffRefund
(
ordersBean
));
list
.
add
(
responseVo
);
list
.
add
(
responseVo
);
});
});
return
list
;
return
list
;
...
@@ -4115,4 +4117,22 @@ public class OrderAdapter {
...
@@ -4115,4 +4117,22 @@ public class OrderAdapter {
}
}
return
"下单成功"
;
return
"下单成功"
;
}
}
/**
* 获取是否支持订单退款
*/
public
Integer
getPayTurnoffRefund
(
QueryOrdersResponse
.
DataBean
.
OrderBean
orderBean
){
Integer
payTurnoffRefund
=
0
;
try
{
String
configValue
=
redisCache
.
getValue
(
RedisKeyConstant
.
SAAS_ORDER_PAYMENT_PARTNERKEY_
+
orderBean
.
getCompanyId
()
+
RedisKeyConstant
.
PARTNER_PAY_TURNOFF_REFUND1
);
if
(
StringUtils
.
isNotEmpty
(
configValue
))
{
log
.
info
(
"getPayTurnoffRefund:{}"
,
JSONObject
.
parseObject
(
configValue
));
JSONObject
jsonObject
=
JSONObject
.
parseObject
(
configValue
);
payTurnoffRefund
=
StringUtils
.
isNotEmpty
(
jsonObject
.
getString
(
"partnerValue"
))
?
0
:
Integer
.
valueOf
(
jsonObject
.
getString
(
"partnerValue"
));
}
}
catch
(
Exception
e
){
log
.
error
(
"getPayTurnoffRefund error:{}"
,
e
.
getMessage
());
}
return
payTurnoffRefund
;
}
}
}
order-application-service/src/main/java/cn/freemud/constant/RedisKeyConstant.java
View file @
ce908ae1
...
@@ -69,6 +69,16 @@ public class RedisKeyConstant {
...
@@ -69,6 +69,16 @@ public class RedisKeyConstant {
*/
*/
public
final
static
String
KGD_SENDPOINT_ORDERID
=
"kgd:sendpoint:orderid:"
;
public
final
static
String
KGD_SENDPOINT_ORDERID
=
"kgd:sendpoint:orderid:"
;
/**
* 支付是否可以退款前缀
*/
public
final
static
String
SAAS_ORDER_PAYMENT_PARTNERKEY_
=
"saas:order:payment:partnerkey_"
;
/**
* 支付是否可以退款后缀
*/
public
final
static
String
PARTNER_PAY_TURNOFF_REFUND1
=
"partner_pay_turnoff_refund1"
;
private
final
static
String
REDIS_KEY_SEP
=
":"
;
private
final
static
String
REDIS_KEY_SEP
=
":"
;
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
ce908ae1
...
@@ -167,6 +167,11 @@ public class QueryOrderResponseVo {
...
@@ -167,6 +167,11 @@ public class QueryOrderResponseVo {
* 是否展示进度条
* 是否展示进度条
*/
*/
private
Integer
orderProgressBarStatus
;
private
Integer
orderProgressBarStatus
;
/**
* 是否支持退款
*/
private
Integer
payTurnoffRefund
;
/**
/**
* 申请退款按钮
* 申请退款按钮
*/
*/
...
...
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