收银台

fuintAdmin/src/api/staff/user/sysconfig.js

@@ -1,9 +1,18 @@
 import request from '@/utils/request'
 
-// 查询会员详细
+// 查询配置信息
 export function getSysConfig(key) {
   return request({
     url: '/sysConfig/getByKey/' + key,
     method: 'get'
   })
 }
+
+// 修改配置信息
+export function editSysConfig(data) {
+  return request({
+    url: '/sysConfig/updateValue',
+    method: 'put',
+    data: data
+  })
+}

fuintAdmin/src/views/member/index.vue

@@ -4,7 +4,7 @@
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="来源油站" prop="storeIds">
           <el-select v-model="queryParams.storeId" filterable clearable placeholder="来源油站" style="width: 100%;">
-            <el-option v-for="item in storeList" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+            <el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item label="会员号" prop="userNo">

fuintAdmin/src/views/userGrade/index.vue

@@ -448,7 +448,7 @@ import {
   updateUserGrade
 } from "@/api/staff/user/usergrade";
 import {getChainStoreConfig, updateChainStoreConfig} from "@/api/staff/user/chainstoreconfig";
-import {getSysConfig} from "@/api/staff/user/sysconfig";
+import {editSysConfig, getSysConfig} from "@/api/staff/user/sysconfig";
 export default {
   name: "UserGradeIndex",
   dicts: ['yhlx','zhzt','yhhdz'],
@@ -511,6 +511,11 @@ export default {
       catchTypeList: [],
       // 是否显示弹出层
       open: false,
+      // 等级开启信息
+      map:{
+        keyStr:"is_enable_level",
+        valueStr:""
+      },
       // 默认排序
       defaultSort: {prop: 'createTime', order: 'descending'},
       // 表单参数
@@ -583,14 +588,20 @@ export default {
       });
     },
     editLevel1(){
-      this.level1 = false;
+      this.map.valueStr = "yes"
-      this.level2 = true;
+      editSysConfig(this.map).then(res => {
-      this.$modal.msgSuccess("等级状态更新成功");
+        this.level1 = false;
+        this.level2 = true;
+        this.$modal.msgSuccess("等级状态更新成功");
+      })
     },
     editLevel2(){
-      this.level1 = true;
+      this.map.valueStr = "no"
-      this.level2 = false;
+      editSysConfig(this.map).then(res => {
-      this.$modal.msgSuccess("等级状态更新成功");
+        this.level1 = true;
+        this.level2 = false;
+        this.$modal.msgSuccess("等级状态更新成功");
+      })
     },
     addGasOline(){
       let temp= {

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java

@@ -78,7 +78,14 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
     public void ruleCycle(String ruleCycle) {
 //        如果是单日的话则开启定时任务
         if (ruleCycle.equals("singleDay")){
-
+            try {
+//                86400000
+//                Thread.sleep(20000);
+//                System.out.println(1);
+                merchantConfigService.updateMerchIsOpen("0");
+            }catch (Exception e){
+                e.printStackTrace();
+            }
         }
     }
 

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/util/SchudelUtil.java

@@ -1,17 +0,0 @@
-package com.fuint.api.fuyou.util;
-
-import com.fuint.api.fuyou.service.MerchantConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SchudelUtil {
-    @Autowired
-    private MerchantConfigService merchantConfigService;
-
-    @Scheduled(fixedDelay=86400000)
-    public void teak1(){
-        merchantConfigService.updateMerchIsOpen("0");
-    }
-}

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java

@@ -48,6 +48,17 @@ public class LJUserGradeController extends BaseController {
         return getSuccessResult(userGrade);
     }
 
+    /**
+     * 根据id查询会员等级信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/isUse/{id}")
+    public ResponseObject userGrade(@PathVariable Integer id){
+        LJUserGrade userGrade = userGradeService.selectUserGradeByIdIsUse(id);
+        return getSuccessResult(userGrade);
+    }
+
     /**
      * 根据id查询会员等级信息
      * @param map

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java

@@ -23,6 +23,13 @@ public interface LJUserGradeService extends IService<LJUserGrade> {
      */
     public LJUserGrade selectUserGradeById(int id);
 
+    /**
+     * 根据id查询会员等级信息是否可使用
+     * @param id
+     * @return
+     */
+    public LJUserGrade selectUserGradeByIdIsUse(int id);
+
     /**
      * 根据会员等级名称查询会员等级信息
      * @param name

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java

@@ -12,6 +12,8 @@ import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.StringUtils;
 import com.fuint.common.util.TokenUtil;
+import com.fuint.system.config.service.SysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -41,6 +43,18 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
         return baseMapper.selectById(id);
     }
 
+    @Autowired
+    private SysConfigService sysConfigService;
+
+    @Override
+    public LJUserGrade selectUserGradeByIdIsUse(int id) {
+        String isEnableLevel = sysConfigService.getValueByKey("is_enable_level");
+        if (isEnableLevel.equals("yes")){
+            return baseMapper.selectById(id);
+        }
+        return null;
+    }
+
     @Override
     public LJUserGrade selectUserGradeByName(String name) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -61,7 +75,9 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
     public int insertUserGrade(LJUserGrade userGrade) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
-        Integer num = baseMapper.selectCount(null);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("store_id",storeId);
+        Integer num = baseMapper.selectCount(queryWrapper);
         int row = 0;
         if (num<20){
             userGrade.setStoreId(storeId);

fuintBackend/fuint-application/src/main/java/com/fuint/system/config/controller/SysConfigController.java

@@ -90,6 +90,18 @@ public class SysConfigController extends BaseController {
         return getSuccessResult("成功");
     }
 
+    /**
+     * 根据key修改value
+     *
+     * @param sysConfig 实体对象
+     * @return 修改结果
+     */
+    @PutMapping("/updateValue")
+    public ResponseObject updateSysConfig(@RequestBody SysConfig sysConfig) {
+        this.sysConfigService.updateSysConfig(sysConfig);
+        return getSuccessResult("成功");
+    }
+
     /**
      * 删除数据
      *

fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/SysConfigService.java

@@ -12,6 +12,12 @@ import com.fuint.system.config.entity.SysConfig;
 public interface SysConfigService extends IService<SysConfig> {
     void saveVo(SysConfig sysConfig);
     void updateByIdVo(SysConfig sysConfig);
+
+    /**
+     * 根据key修改配置信息
+     * @param sysConfig
+     */
+    void updateSysConfig(SysConfig sysConfig);
     void removeByIdVo(Long id);
     String getValueByKey(String keyStr);
 

fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/impl/SysConfigServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fuint.system.config.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.common.util.RedisUtil;
 import com.fuint.system.config.mapper.SysConfigMapper;
@@ -34,6 +35,17 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
         this.updateById(sysConfig);
     }
 
+    @Override
+    public void updateSysConfig(SysConfig sysConfig) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("key_str",sysConfig.getKeyStr());
+        SysConfig sysConfig1 = baseMapper.selectOne(queryWrapper);
+        if (ObjectUtils.isNotEmpty(sysConfig1)){
+            sysConfig1.setValueStr(sysConfig.getValueStr());
+            baseMapper.updateById(sysConfig1);
+        }
+    }
+
     @Override
     public void removeByIdVo(Long id) {
         SysConfig sysConfig = this.getById(id);

fuintCashierWeb/src/api/cashier/usergrade.js

@@ -17,6 +17,14 @@ export function getUserGrade(id) {
   })
 }
 
+// 查询会员等级详细是否能使用
+export function userGradeInfo(id) {
+  return request({
+    url: '/business/userManager/userGrade/isUse/' + id,
+    method: 'get'
+  })
+}
+
 // 根据会员等级名称查询会员等级信息
 export function queryUserGrade(data) {
   return request({

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -782,7 +782,7 @@
   import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
   import {queryStaffs, staffInfo} from "@/api/cashier/staff";
   import {addLJGoods, goodsOrder, oilOrder} from "@/api/cashier/oilorder";
-  import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
+  import {getUserGrade, listUserGrade, userGradeInfo} from "@/api/cashier/usergrade";
   import {getOilGun} from "@/api/cashier/oilGuns";
   import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
   import {getOilNumberById, oilNumberList} from "@/api/cashier/oilnumber";
@@ -1421,228 +1421,230 @@
         this.gradeDiscount = [];
         getSysConfig('is_enable_level').then(res => {
           if (res.data=="yes") {
-            getUserGrade(id).then(response => {
+            userGradeInfo(id).then(response => {
               let gasolineDiscount = 0;
               let dieselDiscount = 0;
               let naturalGasDiscount = 0;
               _this.gradeDiscount = [];
-              _this.oilOrder.forEach(item => {
+              if (response.data!=null) {
-                let discount = {type: "", full: 0, reduce: 0, liters: 0}
+                _this.oilOrder.forEach(item => {
-                if (item.type == "汽油") {
+                  let discount = {type: "", full: 0, reduce: 0, liters: 0}
-                  let gasolineRule = JSON.parse(response.data.gasolineRule);
+                  if (item.type == "汽油") {
-                  if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+                    let gasolineRule = JSON.parse(response.data.gasolineRule);
-                    if (response.data.gasolineDiscount == "满减优惠") {
+                    if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
-                      let oilDiscount = 0;
+                      if (response.data.gasolineDiscount == "满减优惠") {
-                      discount.type = "满减优惠"
+                        let oilDiscount = 0;
-                      for (let i = 1; i <= gasolineRule.length; i++) {
+                        discount.type = "满减优惠"
-                        // 将满减条件加入等级优惠列表
+                        for (let i = 1; i <= gasolineRule.length; i++) {
-                        if (gasolineRule.length > 1) {
+                          // 将满减条件加入等级优惠列表
-                          if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
+                          if (gasolineRule.length > 1) {
-                            discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
+                            if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                            oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
+                              discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
-                            discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
+                              oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
-                            break;
+                              discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
-                          }
+                              break;
-                          if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
+                            }
-                            discount.full = gasolineRule[i - 1].gasolineRule1
+                            if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                            oilDiscount = gasolineRule[i - 1].gasolineRule2
+                              discount.full = gasolineRule[i - 1].gasolineRule1
-                            discount.reduce = gasolineRule[i - 1].gasolineRule2
+                              oilDiscount = gasolineRule[i - 1].gasolineRule2
-                          }
+                              discount.reduce = gasolineRule[i - 1].gasolineRule2
-                        } else {
+                            }
-                          if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
+                          } else {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
+                            if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                            oilDiscount = gasolineRule[i - 1].gasolineRule2
+                              discount.full = gasolineRule[i - 1].gasolineRule1
-                            discount.reduce = gasolineRule[i - 1].gasolineRule2
+                              oilDiscount = gasolineRule[i - 1].gasolineRule2
+                              discount.reduce = gasolineRule[i - 1].gasolineRule2
+                            }
                           }
                         }
-                      }
+                        if (discount.reduce != 0) {
-                      if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
-                        _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('满减优惠')
-                        _this.checkedCities2.push('满减优惠')
-                      }
-                      gasolineDiscount += +oilDiscount
-                    } else if (response.data.gasolineDiscount == "每升优惠") {
-                      discount.type = "每升优惠"
-                      let oilDiscount = 0;
-                      for (let i = 1; i <= gasolineRule.length; i++) {
-                        // 将满减条件加入等级优惠列表
-                        if (gasolineRule.length > 1) {
-                          if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                            discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
-                            oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                            discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
-                            break;
-                          }
-                          if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
-                            oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
-                          }
-                        } else {
-                          if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
-                            discount.full = gasolineRule[i - 1].gasolineRule1
-                            oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
-                            discount.liters = gasolineRule[i - 1].gasolineRule3
-                          }
                         }
-                      }
+                        gasolineDiscount += +oilDiscount
-                      if (discount.reduce != 0) {
+                      } else if (response.data.gasolineDiscount == "每升优惠") {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每升优惠')
-                      }
-                      gasolineDiscount += +oilDiscount
-                    } else {
-                      gasolineDiscount = 0;
-                    }
-                  }
-                }
-                if (item.type == "柴油") {
-                  let dieselRule = JSON.parse(response.data.dieselRule);
-                  if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
-                    if (response.data.dieselDiscount == "满减优惠") {
-                      let oilDiscount = 0;
-                      discount.type = "满减优惠"
-                      for (let i = 1; i <= dieselRule.length; i++) {
-                        // 将满减条件加入等级优惠列表
-                        if (dieselRule.length > 1) {
-                          if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
-                            discount.full = dieselRule[dieselRule.length - 1].dieselRule1
-                            oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
-                            discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
-                            break;
-                          }
-                          if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
-                            discount.full = dieselRule[i - 1].dieselRule1
-                            oilDiscount = dieselRule[i - 1].dieselRule2
-                            discount.reduce = dieselRule[i - 1].dieselRule2
-                          }
-                        } else {
-                          discount.full = dieselRule[i - 1].dieselRule1
-                          if (item.amount >= dieselRule[i - 1].dieselRule1) {
-                            oilDiscount = dieselRule[i - 1].dieselRule2
-                            discount.reduce = dieselRule[i - 1].dieselRule2
-                          }
-                        }
-                      }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('满减优惠')
-                      }
-                      dieselDiscount += +oilDiscount
-                    } else if (response.data.dieselDiscount == "每升优惠") {
-                      let oilDiscount = 0;
-                      for (let i = 1; i <= dieselRule.length; i++) {
                         discount.type = "每升优惠"
-                        // 将满减条件加入等级优惠列表
+                        let oilDiscount = 0;
-                        if (dieselRule.length > 1) {
+                        for (let i = 1; i <= gasolineRule.length; i++) {
-                          if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
+                          // 将满减条件加入等级优惠列表
-                            discount.full = dieselRule[dieselRule.length - 1].dieselRule1
+                          if (gasolineRule.length > 1) {
-                            oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+                            if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
-                            discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+                              discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
-                            discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
+                              oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
-                            break;
+                              discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
+                              discount.liters = gasolineRule[i - 1].gasolineRule3
+                              break;
+                            }
+                            if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
+                              discount.full = gasolineRule[i - 1].gasolineRule1
+                              oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+                              discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+                              discount.liters = gasolineRule[i - 1].gasolineRule3
+                            }
+                          } else {
+                            if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
+                              discount.full = gasolineRule[i - 1].gasolineRule1
+                              oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+                              discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+                              discount.liters = gasolineRule[i - 1].gasolineRule3
+                            }
                           }
-                          if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+                        }
+                        if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('每升优惠')
+                        }
+                        gasolineDiscount += +oilDiscount
+                      } else {
+                        gasolineDiscount = 0;
+                      }
+                    }
+                  }
+                  if (item.type == "柴油") {
+                    let dieselRule = JSON.parse(response.data.dieselRule);
+                    if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+                      if (response.data.dieselDiscount == "满减优惠") {
+                        let oilDiscount = 0;
+                        discount.type = "满减优惠"
+                        for (let i = 1; i <= dieselRule.length; i++) {
+                          // 将满减条件加入等级优惠列表
+                          if (dieselRule.length > 1) {
+                            if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
+                              discount.full = dieselRule[dieselRule.length - 1].dieselRule1
+                              oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
+                              discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
+                              break;
+                            }
+                            if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+                              discount.full = dieselRule[i - 1].dieselRule1
+                              oilDiscount = dieselRule[i - 1].dieselRule2
+                              discount.reduce = dieselRule[i - 1].dieselRule2
+                            }
+                          } else {
                             discount.full = dieselRule[i - 1].dieselRule1
-                            oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                            if (item.amount >= dieselRule[i - 1].dieselRule1) {
-                            discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                              oilDiscount = dieselRule[i - 1].dieselRule2
-                            discount.liters = dieselRule[i - 1].dieselRule3
+                              discount.reduce = dieselRule[i - 1].dieselRule2
-                          }
+                            }
-                        } else {
-                          discount.full = dieselRule[i - 1].dieselRule1
-                          if (item.amount >= dieselRule[i - 1].dieselRule1) {
-                            oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
-                            discount.liters = dieselRule[i - 1].dieselRule3
                           }
                         }
+                        if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('满减优惠')
+                        }
+                        dieselDiscount += +oilDiscount
+                      } else if (response.data.dieselDiscount == "每升优惠") {
+                        let oilDiscount = 0;
+                        for (let i = 1; i <= dieselRule.length; i++) {
+                          discount.type = "每升优惠"
+                          // 将满减条件加入等级优惠列表
+                          if (dieselRule.length > 1) {
+                            if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
+                              discount.full = dieselRule[dieselRule.length - 1].dieselRule1
+                              oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+                              discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+                              discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
+                              break;
+                            }
+                            if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+                              discount.full = dieselRule[i - 1].dieselRule1
+                              oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                              discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                              discount.liters = dieselRule[i - 1].dieselRule3
+                            }
+                          } else {
+                            discount.full = dieselRule[i - 1].dieselRule1
+                            if (item.amount >= dieselRule[i - 1].dieselRule1) {
+                              oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                              discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+                              discount.liters = dieselRule[i - 1].dieselRule3
+                            }
+                          }
+                        }
+                        if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('每升优惠')
+                        }
+                        dieselDiscount += +oilDiscount
+                      } else {
+                        dieselDiscount = 0;
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每升优惠')
-                      }
-                      dieselDiscount += +oilDiscount
-                    } else {
-                      dieselDiscount = 0;
                     }
                   }
-                }
+                  if (item.type == "天然气") {
-                if (item.type == "天然气") {
+                    let naturalGasRule = JSON.parse(response.data.naturalGasRule);
-                  let naturalGasRule = JSON.parse(response.data.naturalGasRule);
+                    if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
-                  if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+                      if (response.data.naturalGasDiscount == "满减优惠") {
-                    if (response.data.naturalGasDiscount == "满减优惠") {
+                        let oilDiscount = 0;
-                      let oilDiscount = 0;
+                        discount.type = "满减优惠"
-                      discount.type = "满减优惠"
+                        for (let i = 1; i <= naturalGasRule.length; i++) {
-                      for (let i = 1; i <= naturalGasRule.length; i++) {
+                          // 将满减条件加入等级优惠列表
-                        // 将满减条件加入等级优惠列表
+                          if (naturalGasRule.length > 1) {
-                        if (naturalGasRule.length > 1) {
+                            if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
+                              discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                            discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
+                              oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
-                            oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
+                              discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
-                            discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
+                              break;
-                            break;
+                            }
-                          }
+                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
+                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
+                              oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                            oilDiscount = naturalGasRule[i - 1].naturalGasRule2
+                              discount.reduce = naturalGasRule[i - 1].naturalGasRule2
-                            discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+                            }
-                          }
+                          } else {
-                        } else {
+                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
+                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
+                              oilDiscount = naturalGasRule[i - 1].naturalGasRule2
-                            oilDiscount = naturalGasRule[i - 1].naturalGasRule2
+                              discount.reduce = naturalGasRule[i - 1].naturalGasRule2
-                            discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+                            }
                           }
                         }
-                      }
+                        if (discount.reduce != 0) {
-                      if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
-                        _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('满减优惠')
-                        _this.checkedCities2.push('满减优惠')
+                        }
-                      }
+                        naturalGasDiscount += +oilDiscount
-                      naturalGasDiscount += +oilDiscount
+                      } else if (response.data.naturalGasDiscount == "每单位优惠") {
-                    } else if (response.data.naturalGasDiscount == "每单位优惠") {
+                        let oilDiscount = 0;
-                      let oilDiscount = 0;
+                        discount.type = "每单位优惠"
-                      discount.type = "每单位优惠"
+                        for (let i = 1; i <= naturalGasRule.length; i++) {
-                      for (let i = 1; i <= naturalGasRule.length; i++) {
+                          // 将满减条件加入等级优惠列表
-                        // 将满减条件加入等级优惠列表
+                          if (naturalGasRule.length > 1) {
-                        if (naturalGasRule.length > 1) {
+                            if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
+                              discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
-                            discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
+                              oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                            oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
+                              discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
+                              discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
-                            discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
+                              break;
-                            break;
+                            }
-                          }
+                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
+                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
+                              oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+                              discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+                              discount.liters = naturalGasRule[i - 1].naturalGasRule3
-                            discount.liters = naturalGasRule[i - 1].naturalGasRule3
+                            }
-                          }
+                          } else {
-                        } else {
+                            if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
-                          if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
+                              discount.full = naturalGasRule[i - 1].naturalGasRule1
-                            discount.full = naturalGasRule[i - 1].naturalGasRule1
+                              oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+                              discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
-                            discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+                              discount.liters = naturalGasRule[i - 1].naturalGasRule3
-                            discount.liters = naturalGasRule[i - 1].naturalGasRule3
+                            }
                           }
                         }
+                        if (discount.reduce != 0) {
+                          _this.gradeDiscount.push(discount)
+                          _this.checkedCities2.push('每单位优惠')
+                        }
+                        naturalGasDiscount += +oilDiscount
+                      } else {
+                        naturalGasDiscount = 0;
                       }
-                      if (discount.reduce != 0) {
-                        _this.gradeDiscount.push(discount)
-                        _this.checkedCities2.push('每单位优惠')
-                      }
-                      naturalGasDiscount += +oilDiscount
-                    } else {
-                      naturalGasDiscount = 0;
                     }
                   }
-                }
+                })
-              })
+              }
-
+              console.log(response)
               _this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
               _this.checkAll2 = true;
               _this.isExclusion();
@@ -1682,7 +1684,7 @@
             _this.couponIds = response.data
             if (response.data.length>0){
               response.data.forEach(item => {
-                _this.useCouponIds.push(item.id)
+                _this.useCouponIds = item.id
                 let discount = {type:item.type,discountType:item.discountType,name:item.name,oilName:item1.oilName,full:0,reduce:0,discount:0}
                 discount.full = item.satisfiedAmount
                 if (item.type==0){