From 5a278a0965b417e7f39e8c209e2ff401f415066a Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 21 二月 2022 14:07:48 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java
index d7e1a6e..18485d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java
@@ -58,16 +58,18 @@
/**
* 查询商家下已被领取的卷总数
* @param merchantId
+ * @param type
* @return
*/
- Integer selectAppliedCount(@Param("merchantId") Long merchantId);
+ Integer selectAppliedCount(@Param("merchantId") Long merchantId, @Param("type") Integer type);
/**
* 查询商家下已被核销的卷总数
* @param merchantId
+ * @param type
* @return
*/
- Integer selectVerifiedCount(@Param("merchantId") Long merchantId);
+ Integer selectVerifiedCount(@Param("merchantId") Long merchantId, @Param("type") Integer type);
/**
* 获取热门游戏
@@ -78,15 +80,10 @@
/**
* h5分页游戏查询
* @param page
- * @param minX
- * @param maxX
- * @param minY
- * @param maxY
* @param pageMcsGameDTO
* @return
*/
- IPage<McsGameVO> pageH5McsGame(@Param("page") Page page, @Param("minX") Double minX, @Param("maxX") Double maxX,
- @Param("minY") Double minY, @Param("maxY") Double maxY, @Param("pageMcsGameDTO") PageMcsGameDTO pageMcsGameDTO);
+ IPage<McsGameVO> pageH5McsGame(@Param("page") Page page, @Param("pageMcsGameDTO") PageMcsGameDTO pageMcsGameDTO);
/**
* 游戏详情
--
Gitblit v1.7.1