diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index 87926a4b8..e03f8e094 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -276,6 +276,7 @@
满减活动
储值卡付款
+ 会员等级
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 @@
{
+ 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 {
boolean add(ActiveOneCouponDTO activeOneCouponDTO);
- IPage select(Page page, QueryWrapper 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 activeOneCouponQueryWrapper) {
+ public IPage select(Page page, ActiveOneCoupon activeOneCoupon) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
LambdaQueryWrapper 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 records = page1.getRecords();
ArrayList activeOneCouponVOArrayList = new ArrayList<>();