From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 c522a07..a9439b1 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,7 +28,23 @@
@Param("userPopulation")Integer userPopulation,
@Param("status")Integer status,
@Param("state")Integer state,
- @Param("page")Page<Map<String, Object>> page);
+ @Param("page")Page<Map<String, Object>> page,
+ @Param("cityCode") String cityCode,
+ @Param("storeId")Integer storeId
+
+ );
+
+ 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,
@@ -38,4 +54,8 @@
@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