diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index 95342f149..c987d9e8b 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -1202,7 +1202,8 @@ export default { let quy = { pageNo: 1, pageSize: 10000, - isonline: 0 + isonline: 0, + activeStatus: 1 } await getCardValueListApi(quy).then(res => { this.cardValueList = res.data.records; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java index 08ba5ff81..cfdfcf3a9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java @@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardFule.controller; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -232,6 +233,8 @@ public class CardFuelDieselController extends BaseController { if (cardFuelDiesel.getActiveStatus().equals("2")) activeApplet.setActiveStatus("1"); activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1"); activeAppletService.updateById(activeApplet); + if (ObjectUtil.isEmpty(cardFuelDiesel.getExpireTime())) + this.cardFuelDieselService.lambdaUpdate().eq(CardFuelDiesel::getId,cardFuelDiesel.getId()).set(CardFuelDiesel::getExpireTime,null).update(); return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel)); } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 29efcd792..cf47d3d33 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -1701,7 +1701,8 @@ let quy = { pageNo: 1, pageSize: 10000, - isonline: 0 + isonline: 0, + activeStatus: 1 } await getCardValueListApi(quy).then(res => { this.cardValueList = res.data.records; diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index e1b756163..decf2d6b6 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -1282,7 +1282,8 @@ export default { let quy = { pageNo: 1, pageSize: 10000, - isonline: 0 + isonline: 0, + activeStatus: 1 } await getCardValueListApi(quy).then(res => { this.cardValueList = res.data.records;