Authored by chenchao

change data construct

@@ -6,6 +6,7 @@ import com.yohobuy.ufo.model.order.req.*; @@ -6,6 +6,7 @@ import com.yohobuy.ufo.model.order.req.*;
6 import com.yohobuy.ufo.model.order.resp.BatchChangePriceResp; 6 import com.yohobuy.ufo.model.order.resp.BatchChangePriceResp;
7 import com.yohobuy.ufo.model.order.resp.OrderListInfo; 7 import com.yohobuy.ufo.model.order.resp.OrderListInfo;
8 import com.yohobuy.ufo.model.order.resp.PageResp; 8 import com.yohobuy.ufo.model.order.resp.PageResp;
  9 +import com.yohobuy.ufo.model.order.resp.SellerOrderListResp;
9 import com.yohoufo.common.ApiResponse; 10 import com.yohoufo.common.ApiResponse;
10 import com.yohoufo.common.annotation.IgnoreSession; 11 import com.yohoufo.common.annotation.IgnoreSession;
11 import com.yohoufo.common.annotation.IgnoreSignature; 12 import com.yohoufo.common.annotation.IgnoreSignature;
@@ -271,7 +272,7 @@ public class SellerOrderController { @@ -271,7 +272,7 @@ public class SellerOrderController {
271 .orderCode(orderCode) 272 .orderCode(orderCode)
272 .build(); 273 .build();
273 logger.info("in ufo.order.refresh, req {}", orderRequest); 274 logger.info("in ufo.order.refresh, req {}", orderRequest);
274 - List<OrderListInfo> orderListInfoRsp = null; 275 + SellerOrderListResp orderListInfoRsp = null;
275 switch (actor){ 276 switch (actor){
276 case BUY: 277 case BUY:
277 278
@@ -9,10 +9,7 @@ import com.yohobuy.ufo.model.order.bo.OrderInfo; @@ -9,10 +9,7 @@ import com.yohobuy.ufo.model.order.bo.OrderInfo;
9 import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo; 9 import com.yohobuy.ufo.model.order.bo.SoldPrdComputeBo;
10 import com.yohobuy.ufo.model.order.common.*; 10 import com.yohobuy.ufo.model.order.common.*;
11 import com.yohobuy.ufo.model.order.req.*; 11 import com.yohobuy.ufo.model.order.req.*;
12 -import com.yohobuy.ufo.model.order.resp.BatchChangePriceResp;  
13 -import com.yohobuy.ufo.model.order.resp.OrderCntResp;  
14 -import com.yohobuy.ufo.model.order.resp.OrderListInfo;  
15 -import com.yohobuy.ufo.model.order.resp.PageResp; 12 +import com.yohobuy.ufo.model.order.resp.*;
16 import com.yohoufo.common.alarm.EventBusPublisher; 13 import com.yohoufo.common.alarm.EventBusPublisher;
17 import com.yohoufo.common.alarm.SmsAlarmEvent; 14 import com.yohoufo.common.alarm.SmsAlarmEvent;
18 import com.yohoufo.common.exception.GatewayException; 15 import com.yohoufo.common.exception.GatewayException;
@@ -728,7 +725,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -728,7 +725,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
728 return total; 725 return total;
729 } 726 }
730 727
731 - public List<OrderListInfo> refresh(OrderRequest req){ 728 + public SellerOrderListResp refresh(OrderRequest req){
732 int uid = req.getUid(); 729 int uid = req.getUid();
733 if(uid <= 0){ 730 if(uid <= 0){
734 log.warn("seller refresh uid illegal , req {}", req); 731 log.warn("seller refresh uid illegal , req {}", req);
@@ -768,7 +765,8 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -768,7 +765,8 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
768 boolean isEntry = userProxyService.isEntryShop(uid); 765 boolean isEntry = userProxyService.isEntryShop(uid);
769 final SellerType sellerType = isEntry ? SellerType.ENTRY : SellerType.COMMON; 766 final SellerType sellerType = isEntry ? SellerType.ENTRY : SellerType.COMMON;
770 log.info("seller refresh ready 2 buildOrderList req {}", req); 767 log.info("seller refresh ready 2 buildOrderList req {}", req);
771 - return sellerOrderListService.buildOrderList(psogList,sellerType); 768 + List<OrderListInfo> list = sellerOrderListService.buildOrderList(psogList,sellerType);
  769 + return SellerOrderListResp.builder().orderListInfos(list).batchNo(bn).build();
772 } 770 }
773 return null; 771 return null;
774 } 772 }