Merge branch 'ww' into test

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java

@@ -257,6 +257,8 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
         List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId);
         log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
         stockCountDTOS.forEach(s -> {
+            //客座费不统计
+            if (!s.getProId().toString().equals("-999")) {
                 if (s.getStockCount() > 0) {
                     TbProductStockDetail productStockDetail = new TbProductStockDetail();
                     productStockDetail.setCreatedAt(System.currentTimeMillis());
@@ -278,6 +280,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
                     tbProductStockDetailRepository.save(productStockDetail);
                 }
                 skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount());
+            }
         });
     }