Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 zq-erp/src/main/java/com/matrix/system/hive/service/ShoppingGoodsService.java

@@ -1,6 +1,9 @@
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;

@@ -100,5 +103,11 @@

   public  ShoppingGoods findByCode(String goodsCode);

   Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type);
   Date calInvalidTime(ShoppingGoods shoppingGoods, Integer type, Date buyDate);

   List<ShoppingGoodsListVo> findShoppingGoodsListForApi(ShoppingGoodsListDto shoppingGoodsListDto);

   int findShoppingGoodsListTotalForApi(ShoppingGoodsListDto shoppingGoodsListDto);

   ShoppingGoodsDetailVo findApiShoppingGoodsDetailById(Long id);
}