czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
SongZhang 2024-10-14 16:28:53 +08:00
parent 4c19b6c9d3 da9a1dc3b8
commit 5e8e6661b9
3 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbShopCategoryRepository.java
View File

@ -38,7 +38,7 @@ public interface TbShopCategoryRepository extends JpaRepository<TbShopCategory,
@Query("SELECT category FROM TbShopCategory category where category.tree IN :ids and category.id != category.tree") @Query("SELECT category FROM TbShopCategory category where category.tree IN :ids and category.id != category.tree")
List<TbShopCategory> findChildren(@Param("ids")List<Integer> ids); List<TbShopCategory> findChildren(@Param("ids")List<Integer> ids);
@Query(" SELECT category FROM TbShopCategory category where category.shopId = :shopId") @Query(" SELECT category FROM TbShopCategory category where category.shopId = :shopId and (category.pid is null or category.pid = '')")
Page<TbShopCategory> findAllBy(@Param("shopId") String shopId,Pageable pageable); Page<TbShopCategory> findAllBy(@Param("shopId") String shopId,Pageable pageable);

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

@ -32,6 +32,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@Service @Service
@ -243,34 +244,45 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
@Override @Override
public void addSaleRecord(Integer orderId) { public void addSaleRecord(Integer orderId) {
List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId); // 先进行延迟
log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS); CompletableFuture<Void> delayFuture = CompletableFuture.runAsync(() -> {
stockCountDTOS.forEach(s -> { try {
//客座费不统计 Thread.sleep(3000L);
if (s.getProId() > 0) { } catch (InterruptedException e) {
if (s.getStockCount() > 0) { Thread.currentThread().interrupt();
TbProductStockDetail productStockDetail = new TbProductStockDetail(); throw new RuntimeException(e);
productStockDetail.setCreatedAt(System.currentTimeMillis());
productStockDetail.setUpdatedAt(System.currentTimeMillis());
productStockDetail.setShopId(s.getShopId());
productStockDetail.setProductId(s.getProId().toString());
productStockDetail.setProductName(s.getProName());
productStockDetail.setOrderId(orderId.toString());
// productStockDetail.setSkuId(s.getSkuId().toString());
productStockDetail.setIsStock(s.getIsStock());//是否开启库存
productStockDetail.setLeftNumber(s.getStockNumber() + s.getStockCount());//原库存
productStockDetail.setSpecSnap(s.getSpecSnap());
productStockDetail.setUnitName(s.getUnitName());
productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount()));
productStockDetail.setSourcePath("NORMAL");
productStockDetail.setType("售出记录");
productStockDetail.setRemark("售出记录:" + orderId);
productStockDetail.setSubType(-1);
tbProductStockDetailRepository.save(productStockDetail);
}
skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount());
} }
}); });
delayFuture.thenRun(() -> {
List<StockCountDTO> stockCountDTOS = stockCountRepository.countStockById(orderId);
log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
stockCountDTOS.forEach(s -> {
if (s.getProId() > 0) {
if (s.getStockCount() > 0) {
TbProductStockDetail productStockDetail = new TbProductStockDetail();
productStockDetail.setCreatedAt(System.currentTimeMillis());
productStockDetail.setUpdatedAt(System.currentTimeMillis());
productStockDetail.setShopId(s.getShopId());
productStockDetail.setProductId(s.getProId().toString());
productStockDetail.setProductName(s.getProName());
productStockDetail.setOrderId(orderId.toString());
// productStockDetail.setSkuId(s.getSkuId().toString());
productStockDetail.setIsStock(s.getIsStock());// 是否开启库存
productStockDetail.setLeftNumber(s.getStockNumber() + s.getStockCount());// 原库存
productStockDetail.setSpecSnap(s.getSpecSnap());
productStockDetail.setUnitName(s.getUnitName());
productStockDetail.setStockNumber(-Double.valueOf(s.getStockCount()));
productStockDetail.setSourcePath("NORMAL");
productStockDetail.setType("售出记录");
productStockDetail.setRemark("售出记录:" + orderId);
productStockDetail.setSubType(-1);
tbProductStockDetailRepository.save(productStockDetail);
}
skutMapper.incrRealSalesNumber(s.getSkuId().intValue(), s.getStockCount());
}
});
});
} }
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbShopCategoryServiceImpl.java
View File

@ -91,7 +91,7 @@ public class TbShopCategoryServiceImpl implements TbShopCategoryService {
.filter(d -> d.getTree()==null || d.getId().equals(d.getTree())) .filter(d -> d.getTree()==null || d.getId().equals(d.getTree()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return PageUtil.toPage(result, page.getTotalElements()-children.size()); return PageUtil.toPage(result, page.getTotalElements());
} }
// @Override // @Override