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/dao/SysOrderItemDao.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java
index 5446b22..b8793dc 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java
@@ -46,7 +46,7 @@
 	 */
 	public List<SysOrderItem> selectByOrderId(@Param("orderId") Long orderId);
 
-	public Integer selectByGoodsId(@Param("goodsId") Long goodsId);
+	public Integer selectByGoodsId(@Param("goodsId") Long goodsId,@Param("vipId") Long vipId);
 
 	public List<SysOrderItem> selectItemByTime(@Param("shopId")Long shopId, @Param("time")Date time);
 
@@ -64,4 +64,6 @@
 	List<OrderDetailItemVo> selectApiOrderDetailItemsByOrderId(@Param("orderId") Long orderId);
 
     List<ErpOrderDetailItemVo> selectErpOrderItemByOrderId(String orderId);
+
+	List<SysOrderItem> selectDgd();
 }
\ No newline at end of file

--
Gitblit v1.9.1