From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
index 42ba242..33e9ddf 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java
@@ -28,6 +28,33 @@
                                                       @Param("userPopulation")Integer userPopulation,
                                                       @Param("status")Integer status,
                                                       @Param("state")Integer state,
-                                                      @Param("page")Page<Map<String, Object>> page);
+                                                      @Param("cityCode") String cityCode,
+                                                      @Param("storeId")Integer storeId,
+                                                      @Param("operatorId")Integer operatorId,
+                                                      @Param("objType")Integer objType);
 
+    List<Map<String, Object>> queryCouponListOfSearch1(@Param("name")String name,
+                                                      @Param("type")Integer type,
+                                                      @Param("distributionMethod")Integer distributionMethod,
+                                                      @Param("userPopulation")Integer userPopulation,
+                                                      @Param("status")Integer status,
+                                                      @Param("state")Integer state,
+                                                      @Param("page")Page<Map<String, Object>> page,
+                                                      @Param("cityCode") String cityCode,
+                                                      @Param("storeId")Integer storeId
+
+    );
+
+    List<Map<String, Object>> queryCouponExamineList(@Param("name")String name,
+                                                     @Param("type")Integer type,
+                                                     @Param("userPopulation") Integer userPopulation,
+                                                     @Param("distributionMethod")Integer distributionMethod,
+                                                     @Param("auditStatus")Integer auditStatus,
+                                                     @Param("page")Page<Map<String, Object>> page);
+
+
+    List<Map<String, Object>> listRecord(@Param("objectPage") Page<Object> objectPage, @Param("id") Integer id, @Param("ids") List<Integer> ids, @Param("type") Integer type);
+
+
+    void updateType(@Param("id") Long id);
 }

--
Gitblit v1.7.1