From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
index 59743fe..87c590d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/mapper/PointsMerchandiseMapper.java
@@ -20,15 +20,27 @@
*/
public interface PointsMerchandiseMapper extends BaseMapper<PointsMerchandise> {
- List<Map<String, Object>> queryGoodsListOfSearch(@Param("name")String name,
- @Param("type")Integer type,
- @Param("redemptionMethod")Integer redemptionMethod,
+ List<Map<String, Object>> queryGoodsListOfSearch(@Param("name") String name,
+ @Param("type") Integer type,
+ @Param("redemptionMethod") Integer redemptionMethod,
@Param("userPopulation") Integer userPopulation,
@Param("activeStatus") Integer activeStatus,
@Param("state") Integer state,
@Param("page") Page<Map<String, Object>> page);
+ List<Map<String, Object>> queryGoodsListOfSearchAudit(@Param("name") String name,
+ @Param("type") Integer type,
+ @Param("redemptionMethod") Integer redemptionMethod,
+ @Param("userPopulation") Integer userPopulation,
+ @Param("activeStatus") Integer activeStatus,
+ @Param("state") Integer state,
+ @Param("page") Page<Map<String, Object>> page);
+
List<Map<String, Object>> ticketList(@Param("query") IntegralGoodsOfSearch ofSearch);
- int changeState(@Param("query") CoachChangeStateVO dto);
+ void changeState(@Param("ids") List<Integer> ids, @Param("state") Integer state);
+
+ void saveCity(@Param("id") Integer id, @Param("province") String province, @Param("provinceCode") String provinceCode, @Param("city") String city, @Param("cityCode") String cityCode);
+
+
}
--
Gitblit v1.7.1