From a5fa1ac5cdcb1b436a96af8344a3a7bf5f83391d Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 16:12:57 +0800
Subject: [PATCH] 10.27.3

---
 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 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 1da2f4b..ebf76cb 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
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.activity.entity.Coupon;
 import com.dsh.activity.feignclient.account.AppUserClient;
@@ -14,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;
 
@@ -103,12 +105,36 @@
 
     @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(),
+                ofSearch.getOperatorId(),
+                ofSearch.getObjType());
     }
 
     @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());
     }
 
+    @Override
+    public List<Map<String, Object>> listRecord(Page<Object> objectPage, Integer id, List<Integer> ids, Integer type) {
+        return this.baseMapper.listRecord(objectPage,id,ids,type);
+    }
+
+    @Override
+    public void updateType(Long id) {
+        this.baseMapper.updateType(id);
+    }
+
 }

--
Gitblit v1.7.1