|
@@ -2247,21 +2247,22 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
if(CollectionUtils.isEmpty(dtos)){
|
|
|
continue;
|
|
|
}
|
|
|
+ Map<Long,Integer> indexMap = new HashMap<>();
|
|
|
Map<Long,List<SellOrder>> goodsSkuMap = dtos.stream().collect(Collectors.groupingBy(e->e.getGoodsSkuId().longValue()));
|
|
|
for (OrderSkuSync.SkuSync skuSync : orderSkuSync.getSkuSyncList()) {
|
|
|
List<SellOrder> sellOrderList = goodsSkuMap.get(skuSync.getSku());
|
|
|
for (int i = 0; i < skuSync.getCount(); i++) {
|
|
|
- SellOrder sellOrder = sellOrderList.get(i);
|
|
|
+ SellOrder sellOrder = sellOrderList.get(indexMap.get(skuSync.getSku())==null?0:indexMap.get(skuSync.getSku()));
|
|
|
if (sellOrder != null) {
|
|
|
sellOrder.setDeliveryTime(format);
|
|
|
sellOrder.setSellCost(skuSync.getPrice());
|
|
|
sellOrder.setStockType(StringUtils.equalsIgnoreCase(skuSync.getType(),"INTERNAL")?StockType.INTERNAL:StockType.EXTERNAL);
|
|
|
}
|
|
|
+ indexMap.put(skuSync.getSku(),i+1);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
sellOrderDao.batchUpdate(sellOrders);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
public BigDecimal getActualAmount(BigDecimal price, StudentPaymentOrderExportDto row) {
|