From 487274f7b8828e5bb7e5efcc914b7a72d63fcf27 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 20:20:36 +0800
Subject: [PATCH] 10.24。2

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index bc5edce..dc3b928 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -15,6 +15,7 @@
 import com.dsh.activity.feignclient.model.CouponListOfSearch;
 import com.dsh.activity.mapper.CouponMapper;
 import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.model.request.IntegralGoodsOfSearch;
 import com.dsh.activity.service.ICouponService;
 import org.springframework.stereotype.Service;
 
@@ -104,10 +105,14 @@
 
     @Override
     public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
-        return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage());
+        return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
     }
 
     @Override
+    public List<Map<String, Object>> queryCouponListOfSearch1(CouponListOfSearch ofSearch) {
+        return this.baseMapper.queryCouponListOfSearch1(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
+    }
+    @Override
     public List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch) {
         return this.baseMapper.queryCouponExamineList(ofSearch.getName(),ofSearch.getType(),ofSearch.getUserPopulation(),ofSearch.getDistributionMethod(),ofSearch.getAuditStatus(),ofSearch.getPage());
     }

--
Gitblit v1.7.1