From 2e3575b4de09c4ad854706e4da2a490fbcfd5a7d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 16:11:59 +0800
Subject: [PATCH] bug

---
 .../activeConsumption/index.vue               |  4 +++-
 .../impl/ActiveConsumptionServiceImpl.java    | 20 +++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 449a09161..7a51bea9e 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -213,7 +213,7 @@
           </el-checkbox-group>
         </el-form-item>
 <!--        选择优惠券-->
-        <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('1')>-1  "   >
+        <div class="xh-box" v-if="form.activeGift && form.activeGift.indexOf('1')>-1 "   >
             <div class="box-bt"> <div >选择优惠券</div>  <el-button type="primary" icon="el-icon-plus" @click="getlistFavorable()" >新增</el-button>  </div>
             <div style="margin: 10px 0px">
               <el-table
@@ -1116,12 +1116,14 @@ export default {
       const id = row.id || this.ids
       getActiveConsumption(id).then(response => {
         this.form = response.data;
+        if (!response.data.activeGift) this.form.activeGift = ""
         if(response.data.activeConsumptionChildList && response.data.activeConsumptionChildList.length >0){
           this.form.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
           this.tableData1 = response.data.activeConsumptionChildList.filter(item => item.activeGift == '1')
           this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2')
           this.form.shiwudata = response.data.activeConsumptionChildList.filter(item => item.activeGift == '4')
         }
+        console.log(this.tableData1)
         this.open = true;
         this.title = "修改消费有礼活动";
       });
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 f8d819e82..f0856c08b 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
@@ -287,17 +287,17 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
                         }
                     }
                 }
-                //封装VO返回
-                activeConsumptionVO.setParticipationConditionMoney(consumption.getParticipationConditionMoney().toString());
-                activeConsumptionVO.setDieselUserLevel(consumption.getDieselUserLevel().split(","));
-                activeConsumptionVO.setGasolineUserLevel(consumption.getGasolineUserLevel().split(","));
-                activeConsumptionVO.setNaturalUserLevel(consumption.getNaturalUserLevel().split(","));
-                activeConsumptionVO.setAdaptOil(Arrays.stream(consumption.getAdaptOil().split(","))
-                        .map(Integer::valueOf)
-                        .toArray(Integer[]::new));
-                activeConsumptionVO.setActiveGift(consumption.getActiveGift().split(","));
-                activeConsumptionVO.setActiveConsumptionChildList(activeConsumptionChildList);
             }
+            //封装VO返回
+            activeConsumptionVO.setParticipationConditionMoney(consumption.getParticipationConditionMoney().toString());
+            activeConsumptionVO.setDieselUserLevel(consumption.getDieselUserLevel().split(","));
+            activeConsumptionVO.setGasolineUserLevel(consumption.getGasolineUserLevel().split(","));
+            activeConsumptionVO.setNaturalUserLevel(consumption.getNaturalUserLevel().split(","));
+            activeConsumptionVO.setAdaptOil(Arrays.stream(consumption.getAdaptOil().split(","))
+                    .map(Integer::valueOf)
+                    .toArray(Integer[]::new));
+            activeConsumptionVO.setActiveGift(consumption.getActiveGift().split(","));
+            activeConsumptionVO.setActiveConsumptionChildList(activeConsumptionChildList);
         }
         return activeConsumptionVO;
     }