From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/CouponMapper.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..d84efa5 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
@@ -22,12 +22,39 @@
Map<String, Object> queryConponRuleOfJson(@Param("id") Integer id);
- List<Map<String, Object>> queryCouponListOfSearch(@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);
+ List<Map<String, Object>> queryCouponListOfSearch(@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("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