Commit e5026d22 by 查志伟

订单宝快餐点餐支持取消订单

parent d5627814
...@@ -337,7 +337,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -337,7 +337,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
return ResponseUtil.success(); return ResponseUtil.success();
} }
List<Integer> newOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV2Code(), OrderStatusV1.COMPLETE.getV2Code(), OrderStatusV1.COMPLETE_MAKE.getV2Code()); List<Integer> newOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV2Code(), OrderStatusV1.COMPLETE.getV2Code(), OrderStatusV1.COMPLETE_MAKE.getV2Code());
List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(), OrderSourceV1.ALIPAY.getCode(), OrderSourceV1.APP.getCode()); List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(), OrderSourceV1.ALIPAY.getCode(), OrderSourceV1.ALAPOS.getCode());
if (sourceList.contains(orderBean.getSource()) && newOrderStatusList.contains(orderBean.getStatusV2())) { if (sourceList.contains(orderBean.getSource()) && newOrderStatusList.contains(orderBean.getStatusV2())) {
return cancelDeliveryAndOrder(request, orderBean); return cancelDeliveryAndOrder(request, orderBean);
} else if (OrderSourceV1.MEAL.getCode().equals(orderBean.getSource())) { } else if (OrderSourceV1.MEAL.getCode().equals(orderBean.getSource())) {
......
...@@ -35,6 +35,7 @@ public enum OrderSourceV1 { ...@@ -35,6 +35,7 @@ public enum OrderSourceV1 {
// BEAUTIFUL("beautiful","美业", 28), // BEAUTIFUL("beautiful","美业", 28),
ASSISTANT("assistant","非码小助手", 29), ASSISTANT("assistant","非码小助手", 29),
SHERPAS("sherpas","食派士", 30), SHERPAS("sherpas","食派士", 30),
ALAPOS("alapos","订单宝", 38),
parkingmanual("parkingmanual", "农工商停车手工录单", 98), parkingmanual("parkingmanual", "农工商停车手工录单", 98),
PARKING("parking", "农工商停车", 99), PARKING("parking", "农工商停车", 99),
; ;
......
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