no message

@@ -30,13 +30,12 @@ public enum  SellerOrderListType {
                   Arrays.asList(OrderStatus.DONE.getCode()),
                   Arrays.asList(OrderStatus.DONE.getCode()),
             Collections.<Integer>emptyList()),
             Collections.<Integer>emptyList()),
 
 
-    ORDER_FAILED(6, "交易失败", Arrays.asList(OrderStatus.SELLER_CANCEL_BEFORE_PAY.getCode(),
+    ORDER_FAILED(6, "交易失败", Arrays.asList(
     OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
     OrderStatus.SELLER_CANCEL_AFTER_PAY.getCode(),
             OrderStatus.SEND_OUT_TIMEOUT.getCode(),
             OrderStatus.SEND_OUT_TIMEOUT.getCode(),
             OrderStatus.CHECKING_FAKE.getCode(),
             OrderStatus.CHECKING_FAKE.getCode(),
             OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode(),
             OrderStatus.BUYER_CANCEL_BEFORE_PAY.getCode(),
-            OrderStatus.BUYER_CANCEL_TIMEOUT.getCode(),
-            OrderStatus.CUSTOMER_SERVICE.getCode()),
+            OrderStatus.BUYER_CANCEL_TIMEOUT.getCode()),
             Collections.<Integer>emptyList());
             Collections.<Integer>emptyList());
 
 
     int type;
     int type;

@@ -6,7 +6,7 @@ import com.yohobuy.ufo.model.order.req.SellerOrderListReq;
 import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
 import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.exception.GatewayException;
 import com.yohoufo.common.exception.GatewayException;
-import com.yohoufo.order.response.OrderInfoListRsp;
+import com.yohoufo.order.response.OrderListInfoRsp;
 import com.yohoufo.order.service.SellerOrderService;
 import com.yohoufo.order.service.SellerOrderService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -85,7 +85,7 @@ public class SellerOrderController {
                 .page(page).limit(limit)
                 .page(page).limit(limit)
                 .build();
                 .build();
         logger.info("in ufo.sellerOrder.getOrderList, req {}", req);
         logger.info("in ufo.sellerOrder.getOrderList, req {}", req);
-        OrderInfoListRsp resp = sellerOrderService.getOrderList(req);
+        OrderListInfoRsp resp = sellerOrderService.getOrderList(req);
         return new ApiResponse.ApiResponseBuilder().data(resp).code(200).message("查询列表成功").build();
         return new ApiResponse.ApiResponseBuilder().data(resp).code(200).message("查询列表成功").build();
     }
     }
 
 

@@ -18,7 +18,7 @@ import com.yohoufo.order.model.GoodsInfo;
 import com.yohoufo.order.model.SellerOrderContext;
 import com.yohoufo.order.model.SellerOrderContext;
 import com.yohoufo.order.model.dto.PlatformFeeDto;
 import com.yohoufo.order.model.dto.PlatformFeeDto;
 import com.yohoufo.order.model.dto.SellerOrderComputeResult;
 import com.yohoufo.order.model.dto.SellerOrderComputeResult;
-import com.yohoufo.order.response.OrderInfoListRsp;
+import com.yohoufo.order.response.OrderListInfoRsp;
 import com.yohoufo.order.service.handler.SellerOrderComputeHandler;
 import com.yohoufo.order.service.handler.SellerOrderComputeHandler;
 import com.yohoufo.order.service.handler.SellerOrderSubmitHandler;
 import com.yohoufo.order.service.handler.SellerOrderSubmitHandler;
 import com.yohoufo.order.service.proxy.UserProxyService;
 import com.yohoufo.order.service.proxy.UserProxyService;
@@ -151,7 +151,7 @@ public class SellerOrderService {
     }
     }
 
 
 
 
-    public OrderInfoListRsp getOrderList(SellerOrderListReq req){
+    public OrderListInfoRsp getOrderList(SellerOrderListReq req){
 
 
         return null;
         return null;
     }
     }

@@ -4,8 +4,8 @@ import com.yoho.core.dal.datasource.annotation.Database;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.dal.order.SellerOrderMapper;
 import com.yohoufo.dal.order.SellerOrderMapper;
 import com.yohoufo.dal.order.model.SellerOrder;
 import com.yohoufo.dal.order.model.SellerOrder;
-import com.yohoufo.order.constants.SellerOrderCancelStatus;
 import com.yohoufo.order.common.SellerOrderStatus;
 import com.yohoufo.order.common.SellerOrderStatus;
+import com.yohoufo.order.constants.SellerOrderCancelStatus;
 import com.yohoufo.order.model.SellerOrderContext;
 import com.yohoufo.order.model.SellerOrderContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;