From 78795abc739f4e1e95c00f278649490e6f193d56 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 7 Mar 2024 11:47:11 +0800 Subject: [PATCH 1/4] bug --- fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue | 4 ++++ .../service/impl/ActiveNewlywedsServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index e3a6e6d7f..5e3dac96c 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -637,6 +637,10 @@ export default { courtesyReward:[], activeNewlywedsChildList:[], } + this.form.tableDatas = [] + this.tableDatas = [] + this.pdidlist = [] + this.pddhidlist = [] }, qrcodelook(url) { this.loadingdialog = true diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java index ce66ec69c..5566b5479 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java @@ -163,6 +163,10 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ActiveNewlyweds::getStoreId,TokenUtil.getNowAccountInfo().getStoreId()); + if (ObjectUtil.isNotEmpty(activeNewlywedss.getName())) + lambdaQueryWrapper.like(ActiveNewlyweds::getName,activeNewlywedss.getName()); + if (ObjectUtil.isNotEmpty(activeNewlywedss.getIsonline())) + lambdaQueryWrapper.eq(ActiveNewlyweds::getIsonline,activeNewlywedss.getIsonline()); //ActiveNewlyweds activeNewlyweds = getOne(lambdaQueryWrapper); IPage page1 = page(page, lambdaQueryWrapper); List list = page1.getRecords(); From 33c27b15a1fea7f1ce530cb297c2f7ff82503dcd Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Thu, 7 Mar 2024 12:03:58 +0800 Subject: [PATCH 2/4] bug --- .../service/impl/ActiveDiscountServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java index c2fe7bf63..d503585ca 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java @@ -168,8 +168,8 @@ public class ActiveDiscountServiceImpl extends ServiceImpl Date: Thu, 7 Mar 2024 12:10:12 +0800 Subject: [PATCH 3/4] bug --- .../service/impl/ActiveFullminusServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java index c4795071b..ce64c8b2c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java @@ -158,8 +158,8 @@ public class ActiveFullminusServiceImpl extends ServiceImpl Date: Thu, 7 Mar 2024 13:37:12 +0800 Subject: [PATCH 4/4] bug --- .../EventMarketing/activeRecommend/index.vue | 25 +++++++++++-------- .../impl/ActiveRecommendServiceImpl.java | 6 +++++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 20507a0ee..5cd4b00ea 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -10,12 +10,12 @@ @keyup.enter.native="handleQuery" /> - - - - - - + + + + + + @@ -56,8 +56,9 @@ @@ -114,7 +115,7 @@ :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" - @pagination="getList" + @pagination="getactivelist" /> @@ -786,7 +787,7 @@ export default { getactivelist(){ this.loading = true; listActiveRecommend(this.queryParams).then(res=>{ - console.log(res) + console.log(res,111) this.zList = res.data.records this.total = res.data.total this.loading = false; @@ -1052,7 +1053,8 @@ export default { /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; - this.getList(); + this.getactivelist(); + // this.getList(); }, /** 重置按钮操作 */ resetQuery() { @@ -1112,6 +1114,7 @@ export default { let data = response.data data.isonline = 1 + data.status = 2 updateActiveRecommend(data).then(response => { this.$modal.msgSuccess("下线成功"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java index c003b5520..3a12ec142 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java @@ -233,6 +233,8 @@ public class ActiveRecommendServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ActiveRecommend::getStoreId,TokenUtil.getNowAccountInfo().getStoreId()); + if (ObjectUtil.isNotEmpty(activeRecommends.getActiveName())) + lambdaQueryWrapper.like(ActiveRecommend::getActiveName,activeRecommends.getActiveName()); + if (ObjectUtil.isNotEmpty(activeRecommends.getIsonline())) + lambdaQueryWrapper.like(ActiveRecommend::getIsonline,activeRecommends.getIsonline()); //ActiveRecommend activeRecommend = getOne(lambdaQueryWrapper); //List list = list(lambdaQueryWrapper); IPage page1 = page(page, lambdaQueryWrapper);