From 92f669102507b3c5f504f719019cf88ee4d5c975 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Tue, 21 Nov 2023 11:00:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActiveExchangeServiceImpl.java             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
index fbc9b0262..69447975d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
@@ -216,8 +216,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
             cardFavorableLambdaQueryWrapper.in(CardFavorable::getOilType,transferDTO.getOilName());
             cardFavorableLambdaQueryWrapper.le(CardFavorable::getSatisfiedAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters());
             List<CardFavorable> list1 = cardFavorableService.list(cardFavorableLambdaQueryWrapper);
-            BeanUtils.copyProperties(list1.get(0), exchangeFavorableVO);
-            exchangeFavorableVOArrayList.add(exchangeFavorableVO);
+            if (list1.size()>0){
+                BeanUtils.copyProperties(list1.get(0), exchangeFavorableVO);
+                exchangeFavorableVOArrayList.add(exchangeFavorableVO);
+            }
         }
         return exchangeFavorableVOArrayList;
     }

From 2d2668b7615b618b41b2e1905880bbd51aa889db Mon Sep 17 00:00:00 2001
From: "@QQNZX" <cccccc420590@163.com>
Date: Tue, 21 Nov 2023 13:40:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?11.21=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activeConsumption/index.vue               | 19 ++++++++++++++-----
 .../EventMarketing/activeDiscount/index.vue   |  9 +++++++++
 .../EventMarketing/activeFullminus/index.vue  |  8 ++++++++
 .../EventMarketing/activeRecommend/index.vue  |  8 ++++++--
 .../EventMarketing/cardExchange/index.vue     | 16 ++++++++--------
 5 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 2b0b243aa..79391359f 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -131,6 +131,12 @@
             <el-radio label="2">等级会员</el-radio>
           </el-radio-group>
         </el-form-item>
+
+        <el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
+          <el-select v-model="form.dieselUserLevel"  multiple clearable placeholder="会员等级">
+            <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" >  </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="赠送类型" prop="activeGift" >
           <el-checkbox-group v-model="form.activeGift">
 
@@ -336,11 +342,6 @@
         </el-row>
 
 
-        <el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
-          <el-select v-model="form.dieselUserLevel"  multiple clearable placeholder="会员等级">
-            <el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" >  </el-option>
-          </el-select>
-        </el-form-item>
 
         <el-form-item label="参与条件" prop="participationCondition">
           <el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
@@ -988,6 +989,10 @@ export default {
       });
     },
     qiyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveConsumption(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
@@ -1001,6 +1006,10 @@ export default {
       });
     },
     jinyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveConsumption(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
index c6655dd6b..20b12075f 100644
--- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
@@ -405,6 +405,11 @@ export default {
       });
     },
     qiyong(row){
+      //
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveDiscount(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
@@ -418,6 +423,10 @@ export default {
       });
     },
     jinyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveDiscount(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
index 9801a2ad7..a452019d8 100644
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@@ -405,6 +405,10 @@ export default {
       });
     },
     qiyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveFullminus(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
@@ -418,6 +422,10 @@ export default {
       });
     },
     jinyong(row){
+      if(row.isonline == 1){
+        this.$message.error("下线不可进行操作")
+        return
+      }
       getActiveFullminus(row.id).then(response => {
         // this.form = response.data;
         let data = response.data
diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
index 5555a2055..ca90549ad 100644
--- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="appconter">
 
     <el-card class="box-card">
       <div slot="header" class="clearfix">
@@ -521,7 +521,7 @@ export default {
         total:0
       },
       dtotal:0,
-      imagePath:'http://192.168.0.196:8080/',
+      imagePath:process.env.VUE_APP_SERVER_URL,
       // 上传地址
       uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
       // 上传文件列表
@@ -950,4 +950,8 @@ export default {
   width: 100%;
   height: 100%;
 }
+.appconter{
+  box-sizing: border-box;
+  padding: 15px;
+}
 </style>
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index f12f9ceae..11c7d70b1 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -127,14 +127,14 @@
               @click="handleXia(scope.row)"
             >下线
             </el-button>
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-delete"
-              v-if="scope.row.isonline == 1"
-              @click="handleShang(scope.row)"
-            >上线
-            </el-button>
+<!--            <el-button-->
+<!--              size="mini"-->
+<!--              type="text"-->
+<!--              icon="el-icon-delete"-->
+<!--              v-if="scope.row.isonline == 1"-->
+<!--              @click="handleShang(scope.row)"-->
+<!--            >上线-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>