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
14e32a14
Commit
14e32a14
authored
Feb 01, 2021
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
b6f253cc
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-9
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
14e32a14
...
...
@@ -73,6 +73,7 @@ import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Maps
;
import
com.google.gson.Gson
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.ObjectUtils
;
import
org.apache.commons.lang.StringUtils
;
...
...
@@ -94,6 +95,7 @@ import java.util.stream.Collectors;
import
static
cn
.
freemud
.
constant
.
OrderRefundConstant
.
ALLOW_REFUND
;
@Component
@Slf4j
public
class
OrderAdapter
{
private
static
FastDateFormat
yyyyMMddHHmmss
=
FastDateFormat
.
getInstance
(
"yyyy-MM-dd HH:mm:ss"
,
Locale
.
CHINA
);
...
...
@@ -607,16 +609,10 @@ public class OrderAdapter {
*/
public
BaseCreateOrderRequest
getCreateOrderDto
(
CreateOrderVo
createOrderVo
)
{
UserDeliveryInfoDto
userDeliveryInfoDto
=
createOrderVo
.
getUserDeliveryInfoDto
();
String
deliveryType
=
""
;
if
(
userDeliveryInfoDto
!=
null
)
{
deliveryType
=
userDeliveryInfoDto
!=
null
&&
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
()
!=
null
?
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
().
getDeliveryType
()
:
""
;
}
else
{
deliveryType
=
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
()
!=
null
String
deliveryType
=
userDeliveryInfoDto
!=
null
&&
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
()
!=
null
?
userDeliveryInfoDto
.
getStoreDeliveryInfoDto
().
getDeliveryType
()
:
""
;
}
createOrderVo
.
setUserDeliveryInfoDto
(
userDeliveryInfoDto
);
log
.
info
(
"getCreateOrderDto sessionId:{},createOrderVo:{}"
,
createOrderVo
.
getSessionId
(),
JSON
.
toJSONString
(
createOrderVo
));
Integer
orderType
;
String
receiveAddress
=
createOrderVo
.
getStoreAddress
();
if
(
Objects
.
equals
(
createOrderVo
.
getOrderType
(),
CreateOrderType
.
TAKE_OUT
.
getCode
()))
{
...
...
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