Skip to content

O
order-group
Commit 52209701 by 徐康
Options

Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由'

parents ac62dcbf 1a7ea1ed
Showing with 5 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -1193,8 +1193,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1193,8 +1193,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
baseResponseDto.setErrcode(100); baseResponseDto.setErrcode(100);
if (orderBean.getType() == 1 && orderBean.getAddInfo() != null) { if (orderBean.getType() == 1 && orderBean.getAddInfo() != null) {
Integer deliverStatus = orderBean.getDeliverStatus(); Integer deliverStatus = orderBean.getDeliverStatus();
if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus) if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)) {
|| ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus) baseResponseDto.setErrmsg(CancelDeliveryResponseDto.notCollectMsg);
return baseResponseDto;
}
if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYCANCEL.getCode(), deliverStatus)
|| ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYARRIVED.getCode(), deliverStatus)) { || ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYARRIVED.getCode(), deliverStatus)) {
return baseResponseDto; return baseResponseDto;
} }
......
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