Merge remote-tracking branch 'origin/zx_saas_goods' into zx_saas_goods

mec-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -870,7 +870,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
                 for (PmsProductSkuStockRecord pmsProductSkuStockRecord : updateList) {
                     pmsProductSkuStockRecordMapper.updateStock(pmsProductSkuStockRecord);
                 }
-                List<Long> skuIds = updateList.stream().map(PmsProductSkuStockRecord::getProductSkuId).collect(Collectors.toList());
+                List<Long> skuIds = skuSyncList.stream().map(OrderSkuSync.SkuSync::getSku).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(skuIds)) {
                     syncSkuStock(skuIds);
                 }