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
7c319713
Commit
7c319713
authored
Nov 19, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上生产 修改版本信息
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
99d40d8f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-0
No files found.
order-application-service/pom.xml
View file @
7c319713
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.thirdparty.sdk
</groupId>
<groupId>
com.freemud.thirdparty.sdk
</groupId>
<artifactId>
thirdparty-weichat-sdk
</artifactId>
<artifactId>
thirdparty-weichat-sdk
</artifactId>
<version>
0.1-BETA
</version>
<version>
1.0.0.RELEASE
</version>
<exclusions>
<exclusions>
<exclusion>
<exclusion>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
7c319713
...
@@ -58,6 +58,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
...
@@ -58,6 +58,7 @@ import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPar
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.*
;
import
com.freemud.application.sdk.api.ordercenter.entities.v1.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.*
;
import
com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1
;
import
com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
import
com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto
;
...
@@ -4553,6 +4554,10 @@ public class OrderAdapter {
...
@@ -4553,6 +4554,10 @@ public class OrderAdapter {
}
}
}
else
{
}
else
{
refundStatusDesc
=
Optional
.
ofNullable
(
RefundStatus
.
getByCode
(
refundBean
.
getStatus
())).
map
(
RefundStatus:
:
getDesc
).
orElse
(
""
);
refundStatusDesc
=
Optional
.
ofNullable
(
RefundStatus
.
getByCode
(
refundBean
.
getStatus
())).
map
(
RefundStatus:
:
getDesc
).
orElse
(
""
);
if
(
Objects
.
equals
(
orderBean
.
getStatus
(),
OrderStatus
.
CALCEL
.
getCode
())
||
Objects
.
equals
(
orderBean
.
getStatusV2
(),
OrderStatusV1
.
CLOSED
.
getV2Code
()))
{
// 表示订单超时自动取消, 修改提示语
refundStatusDesc
=
"超时未支付关闭订单"
;
}
}
}
return
refundStatusDesc
;
return
refundStatusDesc
;
}
}
...
...
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