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
943f3561
Commit
943f3561
authored
May 06, 2021
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复下单地址为空
parent
7413527d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java
+3
-10
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckMallOrder.java
View file @
943f3561
...
@@ -267,24 +267,17 @@ public class CheckMallOrder {
...
@@ -267,24 +267,17 @@ public class CheckMallOrder {
if
(
weixinDeliveryAddress
==
null
||
StringUtils
.
isEmpty
(
weixinDeliveryAddress
.
getProvinceName
()))
{
if
(
weixinDeliveryAddress
==
null
||
StringUtils
.
isEmpty
(
weixinDeliveryAddress
.
getProvinceName
()))
{
throw
new
ServiceException
(
ResponseResult
.
DELIVERY_INFO_ERROR
);
throw
new
ServiceException
(
ResponseResult
.
DELIVERY_INFO_ERROR
);
}
}
// cn.freemud.base.entity.BaseResponse<DeliveryAmountVo> deliveryAmountVoBaseResponse = thirdDeliveryService.queryDeliveryAmount(createOrderVo.getWeixinDeliveryAddress());
// if(deliveryAmountVoBaseResponse == null || !ResponseResult.SUCCESS.getCode().equals(deliveryAmountVoBaseResponse.getCode())) {
// throw new ServiceException(ResponseResult.DELIVERY_INFO_NOT_DELIVERY);
// }
// DeliveryAmountVo deliveryAmountVo = deliveryAmountVoBaseResponse.getResult();
UserDeliveryInfoDto
userDeliveryInfoDto
=
UserDeliveryInfoDto
.
builder
()
UserDeliveryInfoDto
userDeliveryInfoDto
=
UserDeliveryInfoDto
.
builder
()
// .deliveryLimitAmount(storeDeliveryInfoDto.getDeliveryLimitAmount())
.
userEnableTakeaway
(
true
)
.
userEnableTakeaway
(
true
)
// .realDeliveryAmount(deliveryAmountVo.getDeliveryAmount().longValue())
// .storeId(storeDeliveryInfoDto.getStoreId())
// .storeName(storeDeliveryInfoDto.getStoreName())
.
receiveMobile
(
weixinDeliveryAddress
.
getTelNumber
())
.
receiveMobile
(
weixinDeliveryAddress
.
getTelNumber
())
.
receiveUserName
(
weixinDeliveryAddress
.
getUserName
())
.
receiveUserName
(
weixinDeliveryAddress
.
getUserName
())
.
receiveProvince
(
weixinDeliveryAddress
.
getProvinceName
())
.
receiveProvince
(
weixinDeliveryAddress
.
getProvinceName
())
.
receiveCity
(
weixinDeliveryAddress
.
getCityName
())
.
receiveCity
(
weixinDeliveryAddress
.
getCityName
())
.
receiveRegion
(
weixinDeliveryAddress
.
getCountyName
())
.
receiveRegion
(
weixinDeliveryAddress
.
getCountyName
())
.
receiveAddress
(
weixinDeliveryAddress
.
getDetailInfo
()).
build
();
.
receiveAddress
(
weixinDeliveryAddress
.
getDetailInfo
()).
build
();
// .storeDeliveryInfoDto(storeDeliveryInfoDto)
createOrderVo
.
setReceiveMobile
(
weixinDeliveryAddress
.
getTelNumber
());
createOrderVo
.
setReceiveAddress
(
weixinDeliveryAddress
.
getDetailInfo
());
createOrderVo
.
setReceiveUsername
(
weixinDeliveryAddress
.
getUserName
());
createOrderVo
.
setUserDeliveryInfoDto
(
userDeliveryInfoDto
);
createOrderVo
.
setUserDeliveryInfoDto
(
userDeliveryInfoDto
);
}
}
...
...
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