diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java index 269f1cc1..2c7f0406 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryController.java @@ -43,8 +43,8 @@ public class SummaryController { @GetMapping("/dateProduct") private Object shopSummaryProduct(@RequestParam Integer shopId,@RequestParam Integer day, - @RequestParam Integer page){ - return summaryService.selectSummaryProduct(shopId,day,page); + @RequestParam Integer page, @RequestParam Integer size){ + return summaryService.selectSummaryProduct(shopId,day,page,size); } @GetMapping("/datePayType") private Object shopSummaryPayType(@RequestParam Integer shopId,@RequestParam Integer day){ diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/ShopUserDutyDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/ShopUserDutyDetailRepository.java index a639a38b..8534420e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/ShopUserDutyDetailRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/ShopUserDutyDetailRepository.java @@ -23,9 +23,9 @@ public interface ShopUserDutyDetailRepository extends JpaRepository searchByDutyId(@Param("shopId") Integer shopId, @Param("startTime") Date startTime, @Param("endTime") Date endTime - ,@Param("currentPage") Integer currentPage); + ,@Param("currentPage") Integer currentPage, @Param("currentSize")Integer currentSize); @Query(value = "SELECT\n" + diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java index 09dd7ae9..c88ff647 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/TbProductSkuRepository.java @@ -51,10 +51,10 @@ public interface TbProductSkuRepository extends JpaRepository selectSummaryToday(Integer shopId); Map selectSummaryAmount(Integer shopId, Integer day); - Map selectSummaryProduct(Integer shopId, Integer day,Integer page); + Map selectSummaryProduct(Integer shopId, Integer day,Integer page,Integer size); Map selectSummaryPayType(Integer shopId, Integer day); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java index ae2ae8e4..485c03c2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java @@ -170,9 +170,9 @@ public class SummaryServiceImpl implements SummaryService { } @Override - public Map selectSummaryProduct(Integer shopId, Integer day,Integer currentPage){ + public Map selectSummaryProduct(Integer shopId, Integer day,Integer currentPage, Integer currentSize){ //根据时间商品排行 - currentPage = (currentPage - 1) * 5; + currentPage = (currentPage - 1) * currentSize; HashMap map = new HashMap<>(); Date startTime ; Date endTime ; @@ -188,7 +188,7 @@ public class SummaryServiceImpl implements SummaryService { }else { throw new BadRequestException("日期有误"); } - List objects = shopUserDutyDetailRepository.searchByDutyId(shopId,startTime,endTime,currentPage); + List objects = shopUserDutyDetailRepository.searchByDutyId(shopId,startTime,endTime,currentPage,currentSize); List list = new ArrayList<>(); for (Object[] o :objects) { ProductVO productVO = new ProductVO(); @@ -202,10 +202,10 @@ public class SummaryServiceImpl implements SummaryService { Tuple tuple = shopUserDutyDetailRepository.searchByDutyIdSum(shopId, startTime, endTime); //分页数据 Tuple tuple1 = shopUserDutyDetailRepository.searchCount(shopId, startTime, endTime); - map.put("productCount",tuple.get(0, BigDecimal.class)); - map.put("productSum",tuple.get(1, BigDecimal.class)); + map.put("productCount",tuple == null? 0:tuple.get(0, BigDecimal.class)); + map.put("productSum",tuple == null? 0:tuple.get(1, BigDecimal.class)); map.put("totalProduct",list); - map.put("total",tuple1.get(0, BigInteger.class)); + map.put("total",tuple1 == null?0:tuple1.get(0, BigInteger.class)); return map; } @Override diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 5797b398..192ceb10 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -324,7 +324,7 @@ public class TbProductServiceImpl implements TbProductService { TbProductSku tbProductSku = tbProductSkuRepository.searchBarCode(sku.getBarCode()); if (tbProductSku != null){ tbProductSkuRepository.updateByBarCode(sku.getBarCode(),sku.getCostPrice(),sku.getCoverImg(),sku.getFirstShared(),sku.getMemberPrice(), - sku.getOriginPrice(),sku.getSalePrice(),sku.getSpecSnap(),sku.getStockNumber(),tbProductSku.getId()); + sku.getOriginPrice(),sku.getSalePrice(),sku.getSpecSnap(),tbProductSku.getId()); }else { if ("sku".equals(save.getTypeEnum())) { tbProductSkuRepository.deleteByProductId(String.valueOf(save.getId()));