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:
齐天大圣 2024-01-10 15:30:04 +08:00
parent 62635c72c2
commit 075427613d
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/EventMarketing/online/index.vue
View File

@ -75,7 +75,7 @@
this.couponList = response.data.records; this.couponList = response.data.records;
this.total = response.data.total this.total = response.data.total
if( response.data.total == 0){ if( response.data.total == 0){
this.$message.error("未找到兑换券") /* this.$message.error("未找到兑换券")*/
}else{ }else{
} }

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
View File

@ -110,7 +110,7 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
} }
queryWrapper.orderByDesc(CardValue::getCreateTime); queryWrapper.orderByDesc(CardValue::getCreateTime);
IPage page1 = page(page, queryWrapper); IPage page1 = page(page, queryWrapper);
/*List<CardValue> records = page1.getRecords(); List<CardValue> records = page1.getRecords();
CardValueVOs cardValueVO = new CardValueVOs(); CardValueVOs cardValueVO = new CardValueVOs();
ArrayList<CardValueVOs> cardValueVOs = new ArrayList<>(); ArrayList<CardValueVOs> cardValueVOs = new ArrayList<>();
//返回储值卡活动进度状态 //返回储值卡活动进度状态
@ -135,9 +135,16 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
} }
} }
BeanUtils.copyProperties(record,cardValueVO); BeanUtils.copyProperties(record,cardValueVO);
Date startTime = cardValueVO.getStartTime();
Date endTime = cardValueVO.getEndTime();
Date date = new Date();
if(cardValueVO.getActiveTime().equals("1")){
cardValueVOs.add(cardValueVO);
}else if (cardValueVO.getActiveTime().equals("2") && startTime.before(date) && endTime.after(date)){
cardValueVOs.add(cardValueVO); cardValueVOs.add(cardValueVO);
} }
page1.setRecords(cardValueVOs);*/ }
page1.setRecords(cardValueVOs);
return page1; return page1;
} }

17
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -272,7 +272,22 @@
url: '/pagesRefuel/orderSuccess/index' url: '/pagesRefuel/orderSuccess/index'
}) })
}, },
fail: function(err) {} fail: function(err) {
request({
url: "/business/marketingActivity/activeExchange/cardValueOrders",
method: 'put',
data: {
"orderNo": res.data.data.orderNo,
"status": "payFail"
},
}).then((res) => {
uni.showToast({
title: "支付失败!",
icon: "error"
})
})
console.log('fail:', err);
}
}); });
} }