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
cd550654
Commit
cd550654
authored
Sep 14, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
麦咖啡推送数据测试
parent
020c2d01
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+4
-3
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
cd550654
...
...
@@ -2602,7 +2602,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
mcCafePushOrderDto
.
setSourceType
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
ALIPAY
.
getIndex
())?
"ALIMP"
:
"WXMP"
);
mcCafePushOrderDto
.
setBeType
(
"3"
);
mcCafePushOrderDto
.
setDayPart
(
"2"
);
mcCafePushOrderDto
.
setChannel
(
"10"
);
mcCafePushOrderDto
.
setChannel
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
ALIPAY
.
getIndex
())?
"43"
:
"10"
);
mcCafePushOrderDto
.
setStatus
(
NewOrderStatus
.
COMPLETE
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())?
"40"
:
"80"
);
mcCafePushOrderDto
.
setInvoiceNeeded
(
orderExtInfoDto
.
getNeedInvoice
());
mcCafePushOrderDto
.
setInvoiced
(
1
);
...
...
@@ -2764,7 +2765,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
McCafePushOrderDto
.
OrderPayment
orderPayment
=
new
McCafePushOrderDto
.
OrderPayment
();
orderPayment
.
setChannelPayTransactionId
(
orderExtInfoDto
.
getPayTransId
());
orderPayment
.
setPayStatus
(
"PAID"
);
orderPayment
.
setPaySource
(
"10"
);
orderPayment
.
setPaySource
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
ALIPAY
.
getIndex
())?
"43"
:
"10"
);
orderPayment
.
setPayChannel
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
ALIPAY
.
getIndex
())?
"ALI"
:
"WX"
);
orderPayment
.
setPayAmount
(
orderInfoReqs
.
getActualPayAmount
().
intValue
());
if
(
NewOrderStatus
.
CLOSED
.
getIndex
().
equals
(
orderInfoReqs
.
getOrderState
())
&&
CollectionUtils
.
isNotEmpty
(
orderInfoReqs
.
getAfterSalesOrderList
()))
{
...
...
@@ -2841,7 +2842,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
orderDelivery
.
setCompletedTime
(
DateUtil
.
convert2String
(
new
Date
(
Long
.
valueOf
(
orderInfoReqs
.
getReceiveTime
())),
"yyyy-MM-dd HH:mm:ss"
));
orderDelivery
.
setCreatedDate
(
DateUtil
.
convert2String
(
new
Date
(
Long
.
valueOf
(
orderInfoReqs
.
getCreateTime
())),
"yyyy-MM-dd HH:mm:ss"
));
orderAddress
.
setChannel
(
"10"
);
orderAddress
.
setChannel
(
orderInfoReqs
.
getOrderClient
().
equals
(
OrderClientType
.
ALIPAY
.
getIndex
())?
"43"
:
"10"
);
orderAddress
.
setCustomerId
(
orderExtInfoDto
.
getThirdPartyMemberId
());
orderAddress
.
setCustomerNickName
(
orderInfoReqs
.
getUserName
());
...
...
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