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
c76e15de
Commit
c76e15de
authored
Sep 01, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
创建配送单成功,保存配送单id
parent
e4a8757f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+6
-1
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
c76e15de
...
@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
...
@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.service.OrderBaseService
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.redis.RedisCache
;
import
cn.freemud.service.*
;
import
cn.freemud.service.*
;
import
cn.freemud.service.mccafe.thirdparty.DeliveryFeiginMCCafeClient
;
import
cn.freemud.service.mccafe.thirdparty.DeliveryFeiginMCCafeClient
;
...
@@ -230,6 +231,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -230,6 +231,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private
OrderSdkService
orderSdkService
;
private
OrderSdkService
orderSdkService
;
@Autowired
@Autowired
private
EmailAlertService
emailAlertService
;
private
EmailAlertService
emailAlertService
;
@Autowired
private
OrderBaseService
orderBaseService
;
@Override
@Override
public
BaseResponse
createMCCafeOrder
(
CreateOrderVo
createOrderVo
)
{
public
BaseResponse
createMCCafeOrder
(
CreateOrderVo
createOrderVo
)
{
...
@@ -951,6 +954,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -951,6 +954,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
updateDeliveryAbnormal
(
orderBean
.
getCompanyId
(),
orderBean
.
getOid
(),
deliveryId
,
operator
);
updateDeliveryAbnormal
(
orderBean
.
getCompanyId
(),
orderBean
.
getOid
(),
deliveryId
,
operator
);
emailAlertService
.
sendEmailAlert
(
"创建配送单失败"
,
String
.
format
(
"request:%s \r\nresponse:%s"
,
JSONObject
.
toJSONString
(
createDeliveryVo
),
JSONObject
.
toJSONString
(
deliveryResponse
)));
emailAlertService
.
sendEmailAlert
(
"创建配送单失败"
,
String
.
format
(
"request:%s \r\nresponse:%s"
,
JSONObject
.
toJSONString
(
createDeliveryVo
),
JSONObject
.
toJSONString
(
deliveryResponse
)));
return
sendPaySuccessNoticeMessage
();
return
sendPaySuccessNoticeMessage
();
}
else
{
orderBaseService
.
updateDeliverySuccess
(
orderBean
.
getOid
(),
deliveryResponse
.
getData
().
getDeliveryId
(),
"系统"
);
}
}
}
}
...
@@ -1074,7 +1079,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
...
@@ -1074,7 +1079,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if
(
OldOrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getOrderType
()))
{
if
(
OldOrderType
.
TAKE_OUT
.
getCode
().
equals
(
orderBean
.
getOrderType
()))
{
deliveryBaseResponse
=
cancelDelivery
(
orderBean
);
deliveryBaseResponse
=
cancelDelivery
(
orderBean
);
if
(!
ResponseConstant
.
SUCCESS_RESPONSE_CODE
.
equals
(
deliveryBaseResponse
.
getErrcode
()))
{
if
(!
ResponseConstant
.
SUCCESS_RESPONSE_CODE
.
equals
(
deliveryBaseResponse
.
getErrcode
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
getCode
(),
"取消配送单,退款失败"
);
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER__ERRORREFUND
.
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