|
@@ -135,25 +135,26 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
|
// 4. 查询每个sku对应的店铺ID,并传回页面
|
|
// 4. 查询每个sku对应的店铺ID,并传回页面
|
|
List<AppTradeOrderSettlementReqVO.Item> productSkuList = settlementReqVO.getItems();
|
|
List<AppTradeOrderSettlementReqVO.Item> productSkuList = settlementReqVO.getItems();
|
|
List<Long> productSkuIdList = new ArrayList<>();
|
|
List<Long> productSkuIdList = new ArrayList<>();
|
|
- for(AppTradeOrderSettlementReqVO.Item skuItem : productSkuList){
|
|
|
|
|
|
+ for (AppTradeOrderSettlementReqVO.Item skuItem : productSkuList) {
|
|
productSkuIdList.add(skuItem.getSkuId());
|
|
productSkuIdList.add(skuItem.getSkuId());
|
|
}
|
|
}
|
|
// 查询每个skuid对应的sku对象
|
|
// 查询每个skuid对应的sku对象
|
|
List<ProductSkuDO> productSkuDOList = productSkuMapper.selectListBySKuId(productSkuIdList);
|
|
List<ProductSkuDO> productSkuDOList = productSkuMapper.selectListBySKuId(productSkuIdList);
|
|
|
|
|
|
//key为店铺ID,value为skuid的List
|
|
//key为店铺ID,value为skuid的List
|
|
- Map<Long,List<Long>> shopSkuIds = new HashMap<Long, List<Long>>();
|
|
|
|
- for(ProductSkuDO sku:productSkuDOList){//把sku根据店聚合放到map中
|
|
|
|
|
|
+ Map<Long, List<Long>> shopSkuIds = new HashMap<Long, List<Long>>();
|
|
|
|
+ for (ProductSkuDO sku : productSkuDOList) {//把sku根据店聚合放到map中
|
|
Long skuId = sku.getId();
|
|
Long skuId = sku.getId();
|
|
Long shopId = sku.getShopId();
|
|
Long shopId = sku.getShopId();
|
|
- List<Long> shopSkuList = shopSkuIds.get(shopId);
|
|
|
|
- if(shopSkuList==null) {
|
|
|
|
- shopSkuList = new ArrayList<Long>();
|
|
|
|
- shopSkuIds.put(shopId,shopSkuList);
|
|
|
|
|
|
+ if (shopId != null) {
|
|
|
|
+ List<Long> shopSkuList = shopSkuIds.get(shopId);
|
|
|
|
+ if (shopSkuList == null) {
|
|
|
|
+ shopSkuList = new ArrayList<Long>();
|
|
|
|
+ shopSkuIds.put(shopId, shopSkuList);
|
|
|
|
+ }
|
|
|
|
+ shopSkuList.add(skuId);//把sku根据店聚合放到map中
|
|
}
|
|
}
|
|
- shopSkuList.add(skuId);//把sku根据店聚合放到map中
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
respVO.setShopSkuIds(shopSkuIds);//把sku根据店聚合放到map中
|
|
respVO.setShopSkuIds(shopSkuIds);//把sku根据店聚合放到map中
|
|
|
|
|
|
//把店铺id和店铺名称查出来放到map中
|
|
//把店铺id和店铺名称查出来放到map中
|
|
@@ -162,14 +163,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
|
|
shopIds.add(shopid);
|
|
shopIds.add(shopid);
|
|
}
|
|
}
|
|
List<ShopDO> shopDOList = shopMapper.selectListById(shopIds);
|
|
List<ShopDO> shopDOList = shopMapper.selectListById(shopIds);
|
|
- Map<Long,String> shopNameMap = new HashMap<Long,String>();//key为店铺id,value为店铺名
|
|
|
|
|
|
+ Map<Long, String> shopNameMap = new HashMap<Long, String>();//key为店铺id,value为店铺名
|
|
for (ShopDO shopDO : shopDOList) {
|
|
for (ShopDO shopDO : shopDOList) {
|
|
- shopNameMap.put(shopDO.getId(),shopDO.getName());
|
|
|
|
|
|
+ shopNameMap.put(shopDO.getId(), shopDO.getName());
|
|
}
|
|
}
|
|
respVO.setShopNameMap(shopNameMap);
|
|
respVO.setShopNameMap(shopNameMap);
|
|
|
|
|
|
- System.out.println("shopSkuIds@@@@@@@@"+shopSkuIds);
|
|
|
|
- System.out.println("shopNameMap@@@@@@@@"+shopNameMap);
|
|
|
|
|
|
+ System.out.println("shopSkuIds@@@@@@@@" + shopSkuIds);
|
|
|
|
+ System.out.println("shopNameMap@@@@@@@@" + shopNameMap);
|
|
|
|
|
|
return respVO;
|
|
return respVO;
|
|
}
|
|
}
|