Commit 1a7ea1ed by 徐康

运单异常允许退款,未汇集

parent 696df096
...@@ -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