From c423224dbe37ea69c1a36c696f85490343e68c4c Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 09 Aug 2022 09:11:51 +0800
Subject: [PATCH] Merge branch 'developer'

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java
index d0d0ad3..1d690b9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java
@@ -1,5 +1,7 @@
 package com.matrix.system.hive.dao;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.system.hive.bean.MoneyCardUse;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +17,7 @@
  */
 
 
-public interface MoneyCardUseDao{
+public interface MoneyCardUseDao extends BaseMapper<MoneyCardUse> {
 
 	public int insert(MoneyCardUse moneyCardUse);
    	
@@ -84,6 +86,9 @@
 	public Double  selectVipCardTotalMoney(@Param("vipId") Long vipId);
 
 
-	List<MoneyCardUse> selectHasValidMoneyCardUse();
-    
+	int updateInvalidMoneyCardUse();
+
+	void updateId(@Param("id")Long id, @Param("newId")Long i);
+
+	int saveInTimeReceiptWare(@Param("storeReceiptWares") List<JSONObject> storeReceiptWares);
 }
\ No newline at end of file

--
Gitblit v1.9.1