dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-15 09:30:28 +08:00
parent 18bf6b213f
commit d85a897b5c
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/views/member/userInfo.vue
View File

@ -1202,7 +1202,8 @@ export default {
let quy = { let quy = {
pageNo: 1, pageNo: 1,
pageSize: 10000, pageSize: 10000,
isonline: 0 isonline: 0,
activeStatus: 1
} }
await getCardValueListApi(quy).then(res => { await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records; this.cardValueList = res.data.records;

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelDieselController.java
View File

@ -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.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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"); if (cardFuelDiesel.getActiveStatus().equals("2")) activeApplet.setActiveStatus("1");
activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1"); activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1");
activeAppletService.updateById(activeApplet); 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)); return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));
} }

3
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -1701,7 +1701,8 @@
let quy = { let quy = {
pageNo: 1, pageNo: 1,
pageSize: 10000, pageSize: 10000,
isonline: 0 isonline: 0,
activeStatus: 1
} }
await getCardValueListApi(quy).then(res => { await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records; this.cardValueList = res.data.records;

3
fuintCashierWeb/src/views/details/index.vue
View File

@ -1282,7 +1282,8 @@ export default {
let quy = { let quy = {
pageNo: 1, pageNo: 1,
pageSize: 10000, pageSize: 10000,
isonline: 0 isonline: 0,
activeStatus: 1
} }
await getCardValueListApi(quy).then(res => { await getCardValueListApi(quy).then(res => {
this.cardValueList = res.data.records; this.cardValueList = res.data.records;