Commit c76e15de by 徐康

创建配送单成功,保存配送单id

parent e4a8757f
......@@ -39,6 +39,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.management.service.OrderBaseService;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.*;
import cn.freemud.service.mccafe.thirdparty.DeliveryFeiginMCCafeClient;
......@@ -230,6 +231,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
private OrderSdkService orderSdkService;
@Autowired
private EmailAlertService emailAlertService;
@Autowired
private OrderBaseService orderBaseService;
@Override
public BaseResponse createMCCafeOrder(CreateOrderVo createOrderVo) {
......@@ -951,6 +954,8 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
emailAlertService.sendEmailAlert("创建配送单失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(createDeliveryVo), JSONObject.toJSONString(deliveryResponse)));
return sendPaySuccessNoticeMessage();
} else {
orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), "系统");
}
}
......@@ -1074,7 +1079,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
deliveryBaseResponse = cancelDelivery(orderBean);
if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "取消配送单,退款失败");
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "取消配送单失败,退款失败");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment