Commit 81a584d3 by 刘继明

新增诺心蛋糕client

parent 8d4e052d
...@@ -370,7 +370,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -370,7 +370,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.ALAPOS.getCode()); List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(), OrderSourceV1.ALIPAY.getCode(), OrderSourceV1.ALAPOS.getCode(),OrderSourceV1.LE_CAKE.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())) {
......
...@@ -55,6 +55,7 @@ public enum OrderClientType { ...@@ -55,6 +55,7 @@ public enum OrderClientType {
PARKING(99, "农工商停车"), PARKING(99, "农工商停车"),
// CASHIER(36, "收银买单"),//废弃 // CASHIER(36, "收银买单"),//废弃
// WE_CHAT_LIVE_SELL(37, "微信视频卖券"),//废弃 // WE_CHAT_LIVE_SELL(37, "微信视频卖券"),//废弃
LE_CAKE( 40, "诺心蛋糕"),
; ;
......
...@@ -38,6 +38,9 @@ public enum OrderSourceV1 { ...@@ -38,6 +38,9 @@ public enum OrderSourceV1 {
ALAPOS("alapos","订单宝", 38), ALAPOS("alapos","订单宝", 38),
parkingmanual("parkingmanual", "农工商停车手工录单", 98), parkingmanual("parkingmanual", "农工商停车手工录单", 98),
PARKING("parking", "农工商停车", 99), PARKING("parking", "农工商停车", 99),
LE_CAKE("le_cake","诺心蛋糕", 40),
; ;
private String code; private String code;
private String desc; private String desc;
......
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