From b2dfaa957949a333e927c8a8a7ed37d5a8e967cc Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 14:10:07 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue   | 5 +++--
 .../controller/ActiveOneCouponController.java                | 2 +-
 .../activeOneCoupon/service/ActiveOneCouponService.java      | 2 +-
 .../service/impl/ActiveOneCouponServiceImpl.java             | 4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
index ead0d5a42..993613fcb 100644
--- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue
@@ -4,7 +4,7 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="活动名称" prop="name">
           <el-input
-            v-model="queryParams.name"
+            v-model="queryParams.activeName"
             placeholder="请输入活动名称"
             clearable
             @keyup.enter.native="handleQuery"
@@ -714,7 +714,8 @@ export default {
       let data = {
         status:this.status
       }
-      getCardFavorableLists(data).then(response => {
+      this.queryParams.status = this.status
+      getCardFavorableLists(this.queryParams).then(response => {
         this.activeConsumptionList = response.data.records;
         this.total = response.data.total;
         console.log(response)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
index 125dd9367..832a574c0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
@@ -42,7 +42,7 @@ public class ActiveOneCouponController extends BaseController {
                                     @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
                                     @Param("activeOneCoupon") ActiveOneCoupon activeOneCoupon)  {
         Page page = new Page(pageNo, pageSize);
-        return getSuccessResult(this.activeOneCouponService.select(page, new QueryWrapper<>(activeOneCoupon)));
+        return getSuccessResult(this.activeOneCouponService.select(page, activeOneCoupon));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/ActiveOneCouponService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/ActiveOneCouponService.java
index a429b65dd..e1650ee95 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/ActiveOneCouponService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/ActiveOneCouponService.java
@@ -20,7 +20,7 @@ public interface ActiveOneCouponService extends IService<ActiveOneCoupon> {
 
     boolean add(ActiveOneCouponDTO activeOneCouponDTO);
 
-    IPage select(Page page, QueryWrapper<ActiveOneCoupon> activeOneCouponQueryWrapper);
+    IPage select(Page page, ActiveOneCoupon activeOneCoupon);
 
     ActiveOneCouponVO getOneById(Serializable id);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
index 1643c6aa6..4ecd88a1e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
@@ -122,10 +122,12 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
     }
 
     @Override
-    public IPage select(Page page, QueryWrapper<ActiveOneCoupon> activeOneCouponQueryWrapper) {
+    public IPage select(Page page, ActiveOneCoupon activeOneCoupon) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         LambdaQueryWrapper<ActiveOneCoupon> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(nowAccountInfo.getStoreId() != null, ActiveOneCoupon::getStoreId, nowAccountInfo.getStoreId());
+        if (ObjectUtil.isNotEmpty(activeOneCoupon.getActiveName()))
+            queryWrapper.like(ActiveOneCoupon::getActiveName, activeOneCoupon.getActiveName());
         IPage page1 = page(page, queryWrapper);
         List<ActiveOneCoupon> records = page1.getRecords();
         ArrayList<ActiveOneCouponVO> activeOneCouponVOArrayList = new ArrayList<>();