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

Merge branch 'ww' into test

Browse Source
This commit is contained in:
wangw
2024-09-25 17:39:33 +08:00
parent ba025f0e09 57269a1e92
commit b06487848f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
View File

@@ -134,8 +134,8 @@ public class TbConsInfoFlowServiceImpl implements TbConsInfoFlowService {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
criteria.setStartTime(sdf.parse("2024-01-01"));//创建2024年1月1日的Date对象 criteria.setStartTime(sdf.parse("2024-01-01"));//创建2024年1月1日的Date对象
} }
return stockRepository.consStockCount(criteria.getShopId().toString(), criteria.getProductName(), return stockRepository.consStockCount(criteria.getShopId(), criteria.getProductName(),
criteria.getCategoryId(), DateUtil.getStrTime(criteria.getStartTime()), DateUtil.getStrTime(criteria.getEndTime())); criteria.getCategoryId(), criteria.getStartTime(), criteria.getEndTime());
} }
@Override @Override

8
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
View File

@@ -7,6 +7,8 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.util.Date;
/** /**
* @author lyf * @author lyf
@@ -158,8 +160,8 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" flow.shopId = :shopId " + " flow.shopId = :shopId " +
" AND flow.createTime > :startTime " + " AND flow.createTime > :startTime " +
" AND flow.createTime < :endTime ") " AND flow.createTime < :endTime ")
TbProductStockCountVo consStockCount(String shopId, TbProductStockCountVo consStockCount(Integer shopId,
String conName, String conName,
String conTypeId, String startTime, String endTime); String conTypeId, Date startTime, Date endTime);
} }