修改bug

fuintAdmin/src/api/EventMarketing/oilBlock.js

@@ -11,7 +11,7 @@ export function getList(query) {
 // 查询油号
 export function oilName(oilType) {
   return request({
-    url: 'business/petrolStationManagement/oilName/getList?oilType='+oilType,
+    url: '/business/petrolStationManagement/oilNumber/getList2?oilType='+oilType,
     method: 'get',
 
   })

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

@@ -465,7 +465,7 @@
             label="券详情"
             width="100">
             <template slot-scope="scope">
-              <span>满{{scope.row.fullDeduction}}减 {{scope.row.discountAmount}}元 </span>
+              <span>满{{scope.row.satisfiedAmount}}减 {{scope.row.discountAmount}}元 </span>
             </template>
           </el-table-column>
           <el-table-column
@@ -767,7 +767,7 @@
           validityZero: row.validityZero,
           validityOne: row.validityOne,
           validityTwo:row.validityTwo,
-          giftCardDetail: "满"+ row.fullDeduction+"减 "+row.discountAmount+"元" , //券详情
+          giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
           giftCardTime: "", //券有效期
           giftCardTotal: 1//券数量
         }

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

@@ -167,9 +167,9 @@
               <el-select v-model="ruleForm.oilType" placeholder="请选择" >
                 <el-option
                   v-for="dict in oilList"
-                  :key="dict.id.toString()"
+                  :key="dict.id"
                   :label="dict.oilName"
-                  :value="dict.id.toString()">
+                  :value="dict.id">
                 </el-option>
               </el-select>
 
@@ -365,8 +365,8 @@
 
         this.oilList = []
         oilName(this.queryParams.type).then(res=>{
-          this.oilList = res.data
+          this.oilList = res.data.records
-          console.log( this.oilList)
+          console.log('我的油站' ,res)
         })
       },
       getlist(){

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilNumberMapper.xml

@@ -31,17 +31,23 @@
         where store_id = #{oilNumber.storeId}
     </select>
 
+
     <select id="selectOilNumberList2" resultMap="OilNumberResult">
         select
                omm.number_id ,
         onn.oil_type,
         onn.oil_name,
+        onn.id,
         omm.oil_price,
         omm.gb_price
         from oil_number omm
         left join oil_name onn on omm.oil_name = onn.id
-
+        <where>
-        where omm.store_id = #{oilNumber.storeId}
+            omm.store_id = #{oilNumber.storeId}
+        <if test="oilNumber.oilType != null and oilNumber.oilType != ''">
+            and onn.oil_type = #{oilNumber.oilType}
+        </if>
+        </where>
     </select>
 
 <!--    select-->
@@ -139,4 +145,4 @@
             onu.store_id = #{storeId} and onu.state = '启用'
         </where>
     </select>
-</mapper>
+</mapper>