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
9a6a13be
Commit
9a6a13be
authored
Aug 12, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加收货地址校验
parent
a1c0e25e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java
+3
-3
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
+1
-0
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java
View file @
9a6a13be
...
@@ -653,9 +653,9 @@ public class CheckMCCafeOrder {
...
@@ -653,9 +653,9 @@ public class CheckMCCafeOrder {
throw
new
ServiceException
(
ResponseResult
.
ORDER_TAKE_OUT_ADDRESS_NOT_VALID
);
throw
new
ServiceException
(
ResponseResult
.
ORDER_TAKE_OUT_ADDRESS_NOT_VALID
);
}
else
{
}
else
{
List
<
MCCafeDeliveryGetStoreIdResponse
>
mcCafeDeliveryGetStoreIdResponseList
=
JSON
.
parseArray
(
mcCafeDeliveryBaseResponse
.
getData
().
toString
(),
MCCafeDeliveryGetStoreIdResponse
.
class
);
List
<
MCCafeDeliveryGetStoreIdResponse
>
mcCafeDeliveryGetStoreIdResponseList
=
JSON
.
parseArray
(
mcCafeDeliveryBaseResponse
.
getData
().
toString
(),
MCCafeDeliveryGetStoreIdResponse
.
class
);
//
if(mcCafeDeliveryGetStoreIdResponseList.stream().noneMatch(o -> createOrderVo.getShopId().equals(o.getStoreId()+""))) {
if
(
mcCafeDeliveryGetStoreIdResponseList
.
stream
().
noneMatch
(
o
->
createOrderVo
.
getShopId
().
equals
(
o
.
getStoreId
()+
""
)))
{
//
throw new ServiceException(ResponseResult.ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY);
throw
new
ServiceException
(
ResponseResult
.
ORDER_TAKE_OUT_ADDRESS_NOT_DELIVERY
);
//
}
}
}
}
UserDeliveryInfoDto
userDeliveryInfoDto
=
UserDeliveryInfoDto
.
builder
()
UserDeliveryInfoDto
userDeliveryInfoDto
=
UserDeliveryInfoDto
.
builder
()
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
View file @
9a6a13be
...
@@ -224,6 +224,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
...
@@ -224,6 +224,7 @@ public class OrderAdapterServiceImpl implements OrderAdapterService {
if
(
orderBean
.
getBizType
()
==
6
)
{
if
(
orderBean
.
getBizType
()
==
6
)
{
return
sellCouponOrderService
.
paySuccessCallback
(
message
,
confirmOrderDto
,
orderBeans
);
return
sellCouponOrderService
.
paySuccessCallback
(
message
,
confirmOrderDto
,
orderBeans
);
}
}
//麦咖啡订单处理
if
(
mcCafePartnerId
.
equals
(
orderBean
.
getOid
()))
{
if
(
mcCafePartnerId
.
equals
(
orderBean
.
getOid
()))
{
return
mcCafeOrderService
.
paySuccessCallback
(
message
,
confirmOrderDto
,
orderBeans
);
return
mcCafeOrderService
.
paySuccessCallback
(
message
,
confirmOrderDto
,
orderBeans
);
}
}
...
...
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