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
a470a7fe
Commit
a470a7fe
authored
Sep 30, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
停车场订单正向逻辑
parent
59432323
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
2 deletions
+43
-2
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
+43
-2
No files found.
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
View file @
a470a7fe
...
@@ -91,8 +91,12 @@ public class OrderCallBackMQService {
...
@@ -91,8 +91,12 @@ public class OrderCallBackMQService {
sendWechatReportMQ
(
body
);
sendWechatReportMQ
(
body
);
//上报发票信息
//上报发票信息
sendInvoiceReportMQ
(
body
);
sendInvoiceReportMQ
(
body
);
//未支付超时关单,发送队列冲正积分、券码等
//未支付超时关单,发送队列冲正积分、券码等,停车场订单走单独逻辑
revert
(
body
);
if
(
checkParkingOrders
(
orderInfoReqs
))
{
revertParkingOrders
(
body
);
}
else
{
revert
(
body
);
}
}
}
/**
/**
...
@@ -161,6 +165,10 @@ public class OrderCallBackMQService {
...
@@ -161,6 +165,10 @@ public class OrderCallBackMQService {
if
(
ObjectUtils
.
equals
(
1
,
orderInfoReqs
.
getPayState
())
||
ObjectUtils
.
equals
(
NewOrderStatus
.
PENDING_PAYMENT
.
getIndex
(),
orderInfoReqs
.
getOrderState
()))
{
if
(
ObjectUtils
.
equals
(
1
,
orderInfoReqs
.
getPayState
())
||
ObjectUtils
.
equals
(
NewOrderStatus
.
PENDING_PAYMENT
.
getIndex
(),
orderInfoReqs
.
getOrderState
()))
{
return
null
;
return
null
;
}
}
//停车场订单关闭状态不通知开放平台
if
(
checkParkingOrders
(
orderInfoReqs
))
{
return
null
;
}
return
orderInfoReqs
;
return
orderInfoReqs
;
}
}
...
@@ -285,4 +293,37 @@ public class OrderCallBackMQService {
...
@@ -285,4 +293,37 @@ public class OrderCallBackMQService {
log
.
error
(
"callback set invoice mq orderCode={},exception={}"
,
orderInfoReqs
.
getOrderCode
(),
e
.
toString
());
log
.
error
(
"callback set invoice mq orderCode={},exception={}"
,
orderInfoReqs
.
getOrderCode
(),
e
.
toString
());
}
}
}
}
/**
* 冲正库存、券码等
* @param body
*/
public
void
revertParkingOrders
(
OrderCallBackRequestVo
body
){
String
orderCode
=
body
.
getOrderCode
();
ApiLog
.
info
(
"parkingOrderBackOrdersStatusChange"
,
orderCode
);
OrderStatusChangeRequestDto
requestDto
=
new
OrderStatusChangeRequestDto
();
requestDto
.
setOid
(
orderCode
);
//2:未支付
requestDto
.
setOrderStatus
(
2
);
try
{
Header
header
=
new
Header
(
MQAction
.
INSERT
.
getAction
(),
"parkingOrderBackOrdersStatusChange"
,
orderCode
,
backOrdersChangeOrderStatusConsumerQueue
);
MQMessage
<
OrderStatusChangeRequestDto
>
message
=
new
MQMessage
<>(
header
,
requestDto
);
mqService
.
convertAndSend
(
backOrdersNotifyActivityExchange
,
backOrdersChangeOrderStatusConsumerQueue
,
message
);
}
catch
(
Exception
e
)
{
ErrorLog
.
errorConvertJson
(
this
.
getClass
(),
"parkingOrderBackOrdersStatusChange:"
+
orderCode
,
e
);
}
}
/**
* 检查是否符合停车场订单
* @param orderInfoReqs
* @return
*/
private
boolean
checkParkingOrders
(
OrderInfoReqs
orderInfoReqs
){
if
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
PARKING
.
getIndex
())
&&
orderInfoReqs
.
getBizType
()
==
99
&&
orderInfoReqs
.
getPayState
()
==
3
&&
orderInfoReqs
.
getOrderState
()
==
7
)
{
return
true
;
}
return
false
;
}
}
}
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