Merge remote-tracking branch 'origin/master'

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

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

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

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>

fuintAdmin/src/views/EventMarketing/cardExchange/index.vue

@@ -127,14 +127,14 @@
               @click="handleXia(scope.row)"
             >下线
             </el-button>
-            <el-button
+<!--            <el-button-->
-              size="mini"
+<!--              size="mini"-->
-              type="text"
+<!--              type="text"-->
-              icon="el-icon-delete"
+<!--              icon="el-icon-delete"-->
-              v-if="scope.row.isonline == 1"
+<!--              v-if="scope.row.isonline == 1"-->
-              @click="handleShang(scope.row)"
+<!--              @click="handleShang(scope.row)"-->
-            >上线
+<!--            >上线-->
-            </el-button>
+<!--            </el-button>-->
           </template>
         </el-table-column>
       </el-table>

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java

@@ -215,9 +215,11 @@ 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);
+            if (list1.size()>0){
                 BeanUtils.copyProperties(list1.get(0), exchangeFavorableVO);
                 exchangeFavorableVOArrayList.add(exchangeFavorableVO);
             }
+        }
         return exchangeFavorableVOArrayList;
     }
 }