From 075427613d7b9047fec715d837fa62b42177e3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 10 Jan 2024 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/EventMarketing/online/index.vue   |  2 +-
 .../service/impl/CardValueServiceImpl.java      | 13 ++++++++++---
 .../pagesHome/oilRecharge/oilRecharge.vue       | 17 ++++++++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue
index 8874da12f..c22d6300a 100644
--- a/fuintAdmin/src/views/EventMarketing/online/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/online/index.vue
@@ -75,7 +75,7 @@
           this.couponList = response.data.records;
           this.total = response.data.total
           if( response.data.total == 0){
-            this.$message.error("未找到兑换券")
+           /* this.$message.error("未找到兑换券")*/
           }else{
 
           }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
index 625b2a820..e4671fff4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
@@ -110,7 +110,7 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
         }
         queryWrapper.orderByDesc(CardValue::getCreateTime);
         IPage page1 = page(page, queryWrapper);
-        /*List<CardValue> records = page1.getRecords();
+        List<CardValue> records = page1.getRecords();
         CardValueVOs cardValueVO = new CardValueVOs();
         ArrayList<CardValueVOs> cardValueVOs = new ArrayList<>();
         //返回储值卡活动进度状态
@@ -135,9 +135,16 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
                 }
             }
             BeanUtils.copyProperties(record,cardValueVO);
-            cardValueVOs.add(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);
+            }
         }
-        page1.setRecords(cardValueVOs);*/
+        page1.setRecords(cardValueVOs);
         return page1;
     }
 
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index ff065868e..f40c98265 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -272,7 +272,22 @@
 									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);
+							}
 						});
 					}