From 62635c72c2caa94c14142e718ec1e2b6f42ca812 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 14:34:55 +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/activeConsumption/index.vue   | 2 +-
 fuintAdmin/src/views/EventMarketing/giftBlock/index.vue    | 6 +++---
 .../service/impl/ActiveConsumptionServiceImpl.java         | 7 +++++++
 .../cardFule/service/impl/CardFuelDieselServiceImpl.java   | 4 +++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 7b9b57b2f..f648a19cb 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -828,7 +828,7 @@ export default {
         validityZero: row.validityZero,
         validityOne: row.validityOne,
         validityTwo:row.validityTwo,
-        giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
+        giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
         giftCardTime: "", //券有效期
         giftCardTotal: 1//券数量
       }
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index f7e3ecb89..ef6e7eeb3 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -42,11 +42,11 @@
           <div class="tj-num">{{tjdata.remaining_amount || 0}}</div>
           <div class="tj-siez">剩余额度</div>
         </el-card>
-        <el-card  class="kar" style="cursor: pointer;height: 106px " >
+<!--        <el-card  class="kar" style="cursor: pointer;height: 106px " >
 
           <div class="tj-num"> <el-tag v-if="tjdata.exchangeStatus == 0"  @click="putStatus(1)">启用</el-tag> <el-tag type="info" v-if="tjdata.exchangeStatus == 1 "  @click="putStatus(0)">禁用</el-tag> </div>
           <div class="tj-siez">兑换功能状态</div>
-        </el-card>
+        </el-card>-->
       </div>
 
       <el-card  style="margin-bottom: 20px">
@@ -328,7 +328,7 @@
   margin-bottom: 20px;
 }
   .kar{
-    width: 20%;
+    width: 25%;
     margin-right: 10px;
   }
   .tj-num{
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
index faf9b2080..6789a1afd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
@@ -69,7 +69,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
         //新增消费有礼活动模板
         ActiveConsumption activeConsumption = new ActiveConsumption();
         if (ObjectUtils.isNotEmpty(activeConsumptionDTO)){
+            String participationConditionMoney = activeConsumptionDTO.getParticipationConditionMoney();
+            double v = Double.parseDouble(participationConditionMoney);
             BeanUtils.copyProperties(activeConsumptionDTO,activeConsumption);
+            activeConsumption.setParticipationConditionMoney(v);
             //适用油号
             activeConsumption.setAdaptOil(arrayToString(activeConsumptionDTO.getAdaptOil()));
             //活动奖品
@@ -155,6 +158,7 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
             if (CollectionUtils.isNotEmpty(activeConsumptionChildList)){
                 //封装VO返回
                 BeanUtils.copyProperties(consumption,activeConsumptionVO);
+                activeConsumptionVO.setParticipationConditionMoney(consumption.getParticipationConditionMoney().toString());
                 activeConsumptionVO.setDieselUserLevel(consumption.getDieselUserLevel().split(","));
                 activeConsumptionVO.setGasolineUserLevel(consumption.getGasolineUserLevel().split(","));
                 activeConsumptionVO.setNaturalUserLevel(consumption.getNaturalUserLevel().split(","));
@@ -179,7 +183,10 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
         boolean update = false;
         //更新消费有礼
         ActiveConsumption activeConsumption = new ActiveConsumption();
+        String participationConditionMoney = activeConsumptionDTO.getParticipationConditionMoney();
+        double participationConditionMoneys = Double.parseDouble(participationConditionMoney);
         BeanUtils.copyProperties(activeConsumptionDTO,activeConsumption);
+        activeConsumption.setParticipationConditionMoney(participationConditionMoneys);
         activeConsumption.setAdaptOil(arrayToString(activeConsumptionDTO.getAdaptOil()));
         activeConsumption.setActiveGift(arrayToString(activeConsumptionDTO.getActiveGift()));
         //柴油会员等级
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
index 224a9e9e8..b15c43e1d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
@@ -113,7 +113,9 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
             Date startTime = record.getStartTime();
             Date endTime = record.getEndTime();
             Date date = new Date();
-            if(startTime.before(date) && endTime.after(date)){
+            if (record.getActiveTime().equals("1")){
+                cardFuelDiesels.add(record);
+            }else if (startTime.before(date) && endTime.after(date)){
                 cardFuelDiesels.add(record);
             }
         }