From 9f10609773b45b26c709513f718d0783b19d5cda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:41:20 +0800
Subject: [PATCH] 合并代码
---
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
index 1f0ed56..26be27d 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java
@@ -19,12 +19,16 @@
* @param vipId
* @return
*/
- int selectUserTotalScore(@Param("openId") String openId, @Param("openId")Long vipId);
+ int selectUserTotalScore(@Param("vipId")Long vipId);
/**
* 查询用户有效的积分，按时间顺序排
* @param
* @return
*/
- List<ScoreVipDetail> selectEffectiveScore(@Param("openId") String openId, @Param("openId")Long vipId);
+ List<ScoreVipDetail> selectEffectiveScore(@Param("vipId")Long vipId);
+
+ List<ScoreVipDetail> selectInvalidaVipScore();
+
+ int invalidVipScore();
}
\ No newline at end of file
--
Gitblit v1.9.1