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
33e748bf
Commit
33e748bf
authored
May 14, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂时屏蔽 涉及到 refundTips相关的赋值
parent
ea55423c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+0
-5
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-1
No files found.
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
33e748bf
...
...
@@ -208,11 +208,6 @@ public class QueryOrderResponseVo {
private
String
refundCreateTime
;
/**
* 退款文案提示 若48小时后商家未处理,自动同意/拒绝退款
*/
private
String
refundTips
;
/**
* 订单备注
*/
private
String
orderRemark
;
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
33e748bf
...
...
@@ -914,6 +914,7 @@ public class OrderServiceImpl implements Orderservice {
}
QueryOrderResponseVo
queryOrderResponseVo
=
queryOrderResponseVos
.
get
(
0
);
//48小时自动退款描述
/* 暂时注销
if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig()!= null
&& queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
...
...
@@ -923,7 +924,7 @@ public class OrderServiceImpl implements Orderservice {
queryOrderResponseVo.setRefundTips("若48小时后商家未处理,拒绝退款");
}
}
*/
if
(
IappIdType
.
WC_XCX
.
getCode
().
equals
(
userInfo
.
getIappId
()))
{
queryOrderResponseVo
.
getProducts
().
stream
().
forEach
(
each
->
{
orderBean
.
getProductList
().
forEach
(
var
->
{
...
...
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