From be3c321ee05b61317ee67100afd1f6d76f8c8873 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 13 Mar 2024 17:02:23 +0800
Subject: [PATCH] bug
---
.../mapper/xml/ActiveAppletMapper.xml | 4 +-
.../controller/CardFuelDieselController.java | 2 +-
gasStation-uni/pagesHome/activeIn/index.vue | 318 +++++++++---------
3 files changed, 163 insertions(+), 161 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml
index e83681b14..2174b739b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml
@@ -10,7 +10,7 @@
FROM
active_applet
where
- store_id = #{activeApplet.storeId}
+ store_id = #{activeApplet.storeId} and isonline = '0'
GROUP BY
type
ORDER BY create_time,type desc
@@ -23,7 +23,7 @@
FROM
active_applet
WHERE type = #{activeApplet.type}
- and store_id = #{activeApplet.storeId}
+ and store_id = #{activeApplet.storeId} and isonline = '0'
ORDER BY create_time desc
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 0f3122421..08ba5ff81 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
@@ -229,7 +229,7 @@ public class CardFuelDieselController extends BaseController {
activeApplet.setPoints(cardFuelDiesel.getPoints());
if (cardFuelDiesel.getActiveStatus().equals("1")) activeApplet.setActiveStatus("2");
- if (cardFuelDiesel.getActiveStatus().equals("0")) activeApplet.setActiveStatus("1");
+ if (cardFuelDiesel.getActiveStatus().equals("2")) activeApplet.setActiveStatus("1");
activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1");
activeAppletService.updateById(activeApplet);
return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));
diff --git a/gasStation-uni/pagesHome/activeIn/index.vue b/gasStation-uni/pagesHome/activeIn/index.vue
index 161323e2b..055fd2f00 100644
--- a/gasStation-uni/pagesHome/activeIn/index.vue
+++ b/gasStation-uni/pagesHome/activeIn/index.vue
@@ -7,179 +7,181 @@
-
-
-
-
-
-
-
-
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间
- {{item.time}}
+
+
+
+
+
+
+
+
+
- 参与油品
-
- {{item}}
-
-
-
-
- 参与会员：{{item.adaptUserType}}
+
+ 活动介绍
+ {{item.discountActiveDescribe || ""}}
+
+ 活动时间
+ {{item.time}}
-
-
- 获得奖励：赠送{{item.points}}积分
+ 参与油品
+
+ {{item}}
+
+
+
+
+ 参与会员：{{item.adaptUserType}}
+
+
+
+ 获得奖励：赠送{{item.points}}积分
+
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间
- {{item.time}}
-
- 参与油品
-
- {{item}}
-
-
-
-
- 参与会员：{{item.adaptUserType}}
+
+ 活动介绍
+ {{item.discountActiveDescribe || ""}}
+
+ 活动时间
+ {{item.time}}
-
+
+
+
+ 活动介绍
+ {{item.discountActiveDescribe || ""}}
+
+ 活动时间
+ {{item.time}}
+
+ 参与油品
+
+ {{item}}
+
+
+
+
+ 参与会员：{{item.adaptUserType}}
+
+
+
+
+
+ 活动介绍
+ {{item.discountActiveDescribe || ""}}
+
+ 活动时间：{{item.time}}
+
+
-
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间
- {{item.time}}
-
- 参与油品
-
- {{item}}
-
-
-
-
- 参与会员：{{item.adaptUserType}}
+
+
+
+ 参与会员：{{item.adaptUserType}}
+
+
+
+ 获得折扣：赠送{{item.points}}积分
+
+
+
+ 获得折扣：赠送{{item.growaValue}}成长值
+
-
-
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间：{{item.time}}
-
-
-
-
-
- 参与会员：{{item.adaptUserType}}
-
-
-
- 获得折扣：赠送{{item.points}}积分
-
-
-
- 获得折扣：赠送{{item.growaValue}}成长值
+
+
+
+ 参与会员：{{item.adaptUserType}}
+
+
+
+ 获得折扣：赠送{{item.points || 0}}积分
+
+
+
+ 获得折扣：赠送{{item.growaValue || 0}}成长值
+
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间：{{item.time}}
-
-
-
-
-
- 参与会员：{{item.adaptUserType}}
+
+ 活动介绍
+ {{item.discountActiveDescribe || ""}}
+
+ 活动时间
+ {{item.time || ''}}
-
-
- 获得折扣：赠送{{item.points || 0}}积分
-
-
-
- 获得折扣：赠送{{item.growaValue || 0}}成长值
-
-
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间
- {{item.time || ''}}
-
-
-
-
-
+
-
-
- 赠送{{item.points || ''}}积分
-
-
-
- 赠送{{item.growaValue || ''}}成长值
+
+
+
+
+ 赠送{{item.points || ''}}积分
+
+
+
+ 赠送{{item.growaValue || ''}}成长值
+
-
-
- 活动介绍
- {{item.discountActiveDescribe || ""}}
-
- 活动时间：{{item.time}}
-
-
-
-
-
-
- 赠送{{item.points || ''}}积分
-
-
-
- 赠送{{item.growaValue || ''}}成长值
+
+
+
+
+ 赠送{{item.points || ''}}积分
+
+
+
+ 赠送{{item.growaValue || ''}}成长值
+