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
jenkins
order-group
Commits
b14347d1
Commit
b14347d1
authored
Feb 14, 2020
by
shuhu.hou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微信订单上传,订单状态修改
parent
7952ca86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
+2
-2
call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java
+1
-1
No files found.
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
View file @
b14347d1
...
@@ -176,8 +176,8 @@ public class OrderCallBackMQService {
...
@@ -176,8 +176,8 @@ public class OrderCallBackMQService {
wechatReportOrderDto
.
setOutTradeNo
(
orderExtInfoDto
.
getPayTransId
());
wechatReportOrderDto
.
setOutTradeNo
(
orderExtInfoDto
.
getPayTransId
());
wechatReportOrderDto
.
setTotalAmount
(
orderInfoReqs
.
getOriginalAmount
().
intValue
());
wechatReportOrderDto
.
setTotalAmount
(
orderInfoReqs
.
getOriginalAmount
().
intValue
());
wechatReportOrderDto
.
setDiscountAmount
(
orderInfoReqs
.
getSettlementAmount
().
intValue
());
wechatReportOrderDto
.
setDiscountAmount
(
orderInfoReqs
.
getSettlementAmount
().
intValue
());
//订单状态 (
CREATE_DEAL—用户下单;PAY_SUCCESS
—支付完成)
//订单状态 (
2—用户下单;1
—支付完成)
wechatReportOrderDto
.
setStatus
(
NewOrderStatus
.
PENDING_PAYMENT
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())
?
"CREATE_DEAL"
:
"PAY_SUCCESS"
);
wechatReportOrderDto
.
setStatus
(
NewOrderStatus
.
PENDING_PAYMENT
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())
?
2
:
1
);
List
<
WechatReportOrderDto
.
DishInfo
>
list
=
new
ArrayList
<>();
List
<
WechatReportOrderDto
.
DishInfo
>
list
=
new
ArrayList
<>();
for
(
OrderItemResp
item
:
orderInfoReqs
.
getOrderItemList
())
{
for
(
OrderItemResp
item
:
orderInfoReqs
.
getOrderItemList
())
{
...
...
call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java
View file @
b14347d1
...
@@ -69,7 +69,7 @@ public class WechatReportOrderDto {
...
@@ -69,7 +69,7 @@ public class WechatReportOrderDto {
/**
/**
* 订单状态 (CREATE_DEAL—用户下单;PAY_SUCCESS—支付完成)
* 订单状态 (CREATE_DEAL—用户下单;PAY_SUCCESS—支付完成)
*/
*/
private
String
status
;
private
Integer
status
;
/**
/**
* 微信支付订单号(status 为 PAY_SUCCESS时必填)
* 微信支付订单号(status 为 PAY_SUCCESS时必填)
*/
*/
...
...
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