...
|
...
|
@@ -261,7 +261,7 @@ public class SkupListService { |
|
|
|
|
|
List<OrderListInfo> data ;
|
|
|
data = sogList.parallelStream()
|
|
|
.map(sog -> buildOrderListInfo(sog, statusList))
|
|
|
.map(sog -> buildEntryOrderListInfo(sog, statusList))
|
|
|
.filter(oli -> Objects.nonNull(oli))
|
|
|
.collect(Collectors.toList());
|
|
|
return data;
|
...
|
...
|
@@ -285,10 +285,10 @@ public class SkupListService { |
|
|
logger.warn("in getOrderListInfo soglist is empty req {}", req);
|
|
|
return null;
|
|
|
}
|
|
|
return buildOrderListInfo(sogList.get(0), Arrays.asList(status));
|
|
|
return buildEntryOrderListInfo(sogList.get(0), Arrays.asList(status));
|
|
|
}
|
|
|
|
|
|
OrderListInfo buildOrderListInfo(SellerOrderGoods sellerOrderGoods, List<Integer> statusList) {
|
|
|
OrderListInfo buildEntryOrderListInfo(SellerOrderGoods sellerOrderGoods, List<Integer> statusList) {
|
|
|
Integer uid;
|
|
|
OrderListInfo orderListInfo = new OrderListInfo();
|
|
|
orderListInfo.setUid(uid = sellerOrderGoods.getUid());
|
...
|
...
|
@@ -313,11 +313,15 @@ public class SkupListService { |
|
|
productInfo.setImageUrl(imageUrl);
|
|
|
Integer productId;
|
|
|
productInfo.setProductId(productId=sellerOrderGoods.getProductId());
|
|
|
productInfo.setEntryFlag(true);
|
|
|
//
|
|
|
SellerOrderGoods psogOfMerge = sellerOrderGoodsViewMapper.selectByUidStatusGBSkc(uid,statusList,productId);
|
|
|
if (psogOfMerge != null){
|
|
|
productInfo.setStorageNum(psogOfMerge.getStorageNum());
|
|
|
productInfo.setSizeNum(psogOfMerge.getSizeNum());
|
|
|
//6个尺码,60个商品库存
|
|
|
productInfo.setSizeNumDesc(psogOfMerge.getSizeNum() + "个尺码");
|
|
|
productInfo.setSizeNumDesc(psogOfMerge.getStorageNum() + "个商品库存");
|
|
|
}
|
|
|
orderListInfo.setGoodsInfo(productInfo);
|
|
|
return orderListInfo;
|
...
|
...
|
|