From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 22 Feb 2022 23:41:42 +0800 Subject: [PATCH] Merge branch 'developer' --- zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java index 61e0ace..366dbf4 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java @@ -1,9 +1,13 @@ package com.matrix.system.hive.service; import com.matrix.core.pojo.PaginationVO; +import com.matrix.system.app.dto.ShoppingGoodsListDto; +import com.matrix.system.app.vo.ShoppingGoodsDetailVo; +import com.matrix.system.app.vo.ShoppingGoodsListVo; import com.matrix.system.hive.bean.ShoppingGoods; import com.matrix.system.hive.plugin.util.BaseServices; +import java.util.Date; import java.util.List; /** * @@ -98,4 +102,12 @@ public List<ShoppingGoods> findAll(ShoppingGoods shoppingGoods); public ShoppingGoods findByCode(String goodsCode); + + Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type, Date buyDate); + + List<ShoppingGoodsListVo> findShoppingGoodsListForApi(ShoppingGoodsListDto shoppingGoodsListDto); + + int findShoppingGoodsListTotalForApi(ShoppingGoodsListDto shoppingGoodsListDto); + + ShoppingGoodsDetailVo findApiShoppingGoodsDetailById(Long id); } \ No newline at end of file -- Gitblit v1.9.1