From d65675232238852047ffcea0a0a2230104c7a4e5 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 02 Mar 2022 22:50:00 +0800
Subject: [PATCH] Merge branch '配置文件改造' into developer
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java
index 6d46836..0f316fc 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java
@@ -39,13 +39,14 @@
public ShopCouponRecord selectForUpdate(Integer id);
- List<CouponReceiveInfoVO> selectMyCouponByUserId(@Param("userId") String userId);
+ List<CouponReceiveInfoVO> selectMyCouponByUserId(@Param("userId") Long userId);
CouponReceiveInfoVO selectMyCouponByReceiveId(@Param("receiveId") Integer receiveId);
- List<CouponReceiveInfoVO> selectMyCouponByStatus(@Param("shopId") Long shopId, @Param("userId") String userId, @Param("status") Integer status,
+ List<CouponReceiveInfoVO> selectMyCouponByStatus(@Param("companyId") Long shopId, @Param("userId") Long userId, @Param("status") Integer status,
@Param("pageVo") PaginationVO pageVo);
- List<CouponReceiveInfoVO> selectMyPastCoupon(@Param("shopId")Long shopId, @Param("userId") String userId, @Param("pageVo") PaginationVO pageVo);
+ List<CouponReceiveInfoVO> selectMyPastCoupon(@Param("companyId")Long shopId, @Param("userId") Long userId, @Param("pageVo") PaginationVO pageVo);
+ int countUnuseCouponRecord(Long id);
}
\ No newline at end of file
--
Gitblit v1.9.1