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
cd0cabd7
Commit
cd0cabd7
authored
Apr 24, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
89c660f6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
+6
-10
No files found.
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
View file @
cd0cabd7
...
@@ -49,6 +49,7 @@ import org.springframework.stereotype.Component;
...
@@ -49,6 +49,7 @@ import org.springframework.stereotype.Component;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -68,7 +69,7 @@ public class OrderCallBackMQService {
...
@@ -68,7 +69,7 @@ public class OrderCallBackMQService {
@Autowired
@Autowired
private
AssortmentOpenPlatformWxappManager
openPlatformWxappManager
;
private
AssortmentOpenPlatformWxappManager
openPlatformWxappManager
;
@Value
(
"${saas.order.invoice.report.partnerIds}"
)
@Value
(
"${saas.order.invoice.report.partnerIds}"
)
private
String
I
nvoicePartnerIds
;
private
String
i
nvoicePartnerIds
;
public
void
sendOrderMQ
(
OrderCallBackRequestVo
body
)
{
public
void
sendOrderMQ
(
OrderCallBackRequestVo
body
)
{
//发送订单回调
//发送订单回调
...
@@ -235,17 +236,12 @@ public class OrderCallBackMQService {
...
@@ -235,17 +236,12 @@ public class OrderCallBackMQService {
return
;
return
;
}
}
OrderInfoReqs
orderInfoReqs
=
JSONObject
.
parseObject
(
body
.
getContent
(),
OrderInfoReqs
.
class
);
OrderInfoReqs
orderInfoReqs
=
JSONObject
.
parseObject
(
body
.
getContent
(),
OrderInfoReqs
.
class
);
if
(
if
(
orderInfoReqs
==
null
(
||
!
Arrays
.
asList
(
invoicePartnerIds
.
split
(
","
)).
contains
(
orderInfoReqs
.
getPartnerId
())
orderInfoReqs
==
null
||
!
NewOrderStatus
.
PLACE_AN_ORDER
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())
||
!
NewOrderStatus
.
PLACE_AN_ORDER
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())
||
orderInfoReqs
.
getBizType
()!=
1
)
{
||
orderInfoReqs
.
getBizType
()!=
1
)
&&
!
InvoicePartnerIds
.
contains
(
orderInfoReqs
.
getPartnerId
())
)
{
return
;
return
;
}
}
try
{
try
{
Header
header
=
new
Header
(
"report"
,
"call-back-service-api"
,
Header
header
=
new
Header
(
"report"
,
"call-back-service-api"
,
OrderCallBackConfig
.
INVOICE_ROUTE_KEY
,
OrderCallBackConfig
.
INVOICE_QUEUE
);
OrderCallBackConfig
.
INVOICE_ROUTE_KEY
,
OrderCallBackConfig
.
INVOICE_QUEUE
);
...
...
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