围餐未支付取消状态变更

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -244,12 +244,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         List<Integer> oldOrderStatusList = Arrays.asList(OldOrderStatus.RECEIPT.getCode(),OldOrderStatus.COMPLETE.getCode(),OldOrderStatus.COMPLETE_MAKE.getCode());
         List<String> sourceList = Arrays.asList(OrderSourceType.SAAS.getCode(),OrderSourceType.ALIPAY.getCode(),OrderSourceType.APP.getCode());
         if (sourceList.contains(orderBean.getSource()) && oldOrderStatusList.contains(orderBean.getStatus())) {
-            executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
+           return executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
         } else if (OrderSourceType.MEAL.getCode().equals(orderBean.getSource())) {
             if (OldOrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()) || PayType.CASH_ON_DELIVERY.getCode() == orderBean.getPayType()) {
-                executeCancel(request,orderBean, PayRefundStatus.SUCCESS.getCode(), AfterSalesType.USER_SALE_RETURN.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
+                return executeCancel(request,orderBean, PayRefundStatus.SUCCESS.getCode(), AfterSalesType.PARTNER_CANCEL.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
             } else {
-                executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
+                return executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
             }
         } else if (OrderSourceType.POS.getCode().equals(orderBean.getSource())) {
             return posCancel(orderBean);