ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 58672b3569d645618f5d3cb4a59bba6d6503fb5c 1 parent 5cda94f6

质检

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
@@ -515,7 +515,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -515,7 +515,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
515 515
516 //查询卖家已发货的订单 516 //查询卖家已发货的订单
517 List<BuyerOrder> orderList = queryOrderByQueryStr(queryStr, null, Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal()); 517 List<BuyerOrder> orderList = queryOrderByQueryStr(queryStr, null, Constant.BUYER_ORDER_STATUS_ALLOCATING.getByteVal());
518 - 518 + if(CollectionUtils.isEmpty(orderList)) {
  519 + return null;
  520 + }
  521 +
519 List<BuyerOrderResp> respList = buildBuyerOrderRespForQc(orderList); 522 List<BuyerOrderResp> respList = buildBuyerOrderRespForQc(orderList);
520 if(CollectionUtils.isEmpty(respList)) { 523 if(CollectionUtils.isEmpty(respList)) {
521 return null; 524 return null;
@@ -2103,6 +2106,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -2103,6 +2106,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
2103 } 2106 }
2104 Integer skup = buyerGoodsMap.get(item.getOrderCode()).getSkup(); 2107 Integer skup = buyerGoodsMap.get(item.getOrderCode()).getSkup();
2105 BuyerOrderResp resp = new BuyerOrderResp(); 2108 BuyerOrderResp resp = new BuyerOrderResp();
  2109 + resp.setId(item.getId());
2106 resp.setOrderCode(item.getOrderCode()); 2110 resp.setOrderCode(item.getOrderCode());
2107 resp.setSellerWaybillCode(null == expressInfoMap.get(item.getOrderCode()) ? "" : expressInfoMap.get(item.getOrderCode()).getWaybillCode()); 2111 resp.setSellerWaybillCode(null == expressInfoMap.get(item.getOrderCode()) ? "" : expressInfoMap.get(item.getOrderCode()).getWaybillCode());
2108 resp.setProductName(sellerGoodsMap.get(skup).getProductName()); 2112 resp.setProductName(sellerGoodsMap.get(skup).getProductName());