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
8f69ee3a
Commit
8f69ee3a
authored
Sep 23, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/2020/09/23-1.9.39.1-修订版-张志恒' into qa
parents
facaf067
2e0033a3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
order-application-service/pom.xml
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+0
-2
order-management/pom.xml
+1
-1
No files found.
order-application-service/pom.xml
View file @
8f69ee3a
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
deliverycenter-sdk
</artifactId>
<artifactId>
deliverycenter-sdk
</artifactId>
<version>
1.
5.2-SNAPSHOT
</version>
<version>
1.
6.RELEASE
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
8f69ee3a
...
@@ -1610,8 +1610,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1610,8 +1610,6 @@ public class OrderServiceImpl implements Orderservice {
sendApplyRefundSubscriptionNotice
(
orderBean
,
orderRefundVo
);
sendApplyRefundSubscriptionNotice
(
orderBean
,
orderRefundVo
);
//已接单可发起退款申请,查询门店有无云打印机,有则打印退款申请小票
//已接单可发起退款申请,查询门店有无云打印机,有则打印退款申请小票
printApplyRefundSmallTicket
(
orderBean
,
orderRefundVo
);
printApplyRefundSmallTicket
(
orderBean
,
orderRefundVo
);
//发送消息,冲正券
backOrdersStatusChange
(
orderBean
.
getOid
(),
orderBean
.
getStatus
(),
orderBean
.
getPayStatus
());
}
}
}
}
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
...
...
order-management/pom.xml
View file @
8f69ee3a
...
@@ -95,7 +95,7 @@
...
@@ -95,7 +95,7 @@
<dependency>
<dependency>
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
deliverycenter-sdk
</artifactId>
<artifactId>
deliverycenter-sdk
</artifactId>
<version>
1.
5.2-SNAPSHOT
</version>
<version>
1.
6.RELEASE
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
...
...
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