From c06e8b1c5918a44f8d4037fae0b2079c58dbac3d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 13 Nov 2023 16:51:57 +0800
Subject: [PATCH] =?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

---
 .../src/api/payConfig/merchantconfig.js       |  18 +++
 fuintAdmin/src/api/payConfig/oilconfig.js     |  25 +++
 fuintAdmin/src/views/power/payment/index.vue  | 142 +++++++++++++++---
 fuintAdmin/src/views/userGrade/index.vue      |  86 ++++++-----
 .../controller/MerchantConfigController.java  |  42 ++++++
 .../fuyou/controller/OilConfigController.java |  57 +++++++
 .../api/fuyou/entity/MerchantConfig.java      |   4 +
 .../com/fuint/api/fuyou/entity/OilConfig.java |  44 ++++++
 .../api/fuyou/mapper/OilConfigMapper.java     |  26 ++++
 .../api/fuyou/mapper/xml/OilConfigMapper.xml  |  18 +++
 .../fuyou/service/MerchantConfigService.java  |  46 +++++-
 .../api/fuyou/service/OilConfigService.java   |  30 ++++
 .../impl/MerchantConfigServiceImpl.java       |  63 +++++++-
 .../service/impl/OilConfigServiceImpl.java    |  66 ++++++++
 .../com/fuint/api/fuyou/vo/OilConfigVo.java   |  10 ++
 .../order/entity/CardBalanceChange.java       |  55 +++++++
 .../order/mapper/CardBalanceChangeMapper.java |   7 +
 .../service/CardBalanceChangeService.java     |  13 ++
 .../impl/CardBalanceChangeServiceImpl.java    |  21 +++
 .../service/impl/OilOrderServiceImpl.java     | 135 ++++++++++++++---
 .../controller/OilNameController.java         |   5 +
 .../business/userManager/entity/LJUser.java   |   5 +-
 .../userManager/entity/LJUserGrade.java       |  24 +--
 .../mapper/xml/LJUserGradeMapper.xml          |  12 --
 .../business/userManager/vo/LJUserVo.java     |   2 +-
 .../views/cashier/NewComponents/homeindex.vue |  43 +++++-
 26 files changed, 883 insertions(+), 116 deletions(-)
 create mode 100644 fuintAdmin/src/api/payConfig/merchantconfig.js
 create mode 100644 fuintAdmin/src/api/payConfig/oilconfig.js
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/OilConfig.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/OilConfigMapper.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/vo/OilConfigVo.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java

diff --git a/fuintAdmin/src/api/payConfig/merchantconfig.js b/fuintAdmin/src/api/payConfig/merchantconfig.js
new file mode 100644
index 000000000..4c04e4cef
--- /dev/null
+++ b/fuintAdmin/src/api/payConfig/merchantconfig.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询商户列表
+export function listMerchant() {
+  return request({
+    url: '/api/merchantConfig/list',
+    method: 'get',
+  })
+}
+
+// 修改商户使用状态
+export function editMerchant(data) {
+  return request({
+    url: '/api/merchantConfig',
+    method: 'put',
+    data: data,
+  })
+}
diff --git a/fuintAdmin/src/api/payConfig/oilconfig.js b/fuintAdmin/src/api/payConfig/oilconfig.js
new file mode 100644
index 000000000..cd5ce6bbf
--- /dev/null
+++ b/fuintAdmin/src/api/payConfig/oilconfig.js
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+// 查询支付规则列表
+export function listOilConfig() {
+  return request({
+    url: '/api/oilConfig/list',
+    method: 'get',
+  })
+}
+
+// 是否开启支付规则
+export function isOpenOilConfig(isOpen) {
+  return request({
+    url: '/api/oilConfig/'+isOpen,
+    method: 'get',
+  })
+}
+
+// 根据id查询支付配置信息
+export function oilConfigInfo(id) {
+  return request({
+    url: '/api/oilConfig/info/'+id,
+    method: 'get',
+  })
+}
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index 5e2a2d7f1..a8cafb169 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -1,23 +1,42 @@
 <template>
   <div class="box-centenr">
-    <div style="width: 40%">
+    <div style="width: 100%;display: flex">
       <el-alert
-        title="警告提示的文案"
+        title="说明"
         type="error"
         description="为了保证加油站商户日常在线支付业务的稳定性，油客里里目前支持多通道支付
-可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题
-加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"
+                      可以有效的避免单支付通道带来不稳定性，从而造成油站不能正常支付问题
+                      加油站一旦出现不能正常支付的情况，可以随时手工切换支付通道，来保证加油站支付收款业务"
         :closable="false"
       >
       </el-alert>
+
+      <div style="width: 150%;display: flex;justify-content: right">
+        <div class="mingc">功能状态</div>
+        <el-switch
+          v-model="value1"
+          @change="changeStatus1"
+        >
+        </el-switch>
+      </div>
     </div>
     <div class="content-box">
-      <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">
+<!--      <el-card class="box-card" shadow="hover" v-for="(item,index) in 10" :key="index">-->
+<!--        <div slot="header" class="clearfix">-->
+<!--          <span>卡片名称</span>-->
+<!--          <el-button style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>-->
+<!--        </div>-->
+<!--        <div>商户编号:1861975</div>-->
+<!--      </el-card>-->
+      <el-card class="box-card" shadow="hover" v-for="item in merchantList" :key="item.id">
         <div slot="header" class="clearfix">
-          <span>卡片名称</span>
-          <el-button style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>
+          <span>{{ item.merchantName }}</span>
+          <el-button v-if="item.isUse=='0'"
+                     @click="editStatus(item,1)"
+                     style="float: right; padding: 3px 0" type="text">切换为当前通道</el-button>
+          <el-tag v-else effect="dark" type="success" style="float: right">当前使用中</el-tag>
         </div>
-        <div>商户编号:1861975</div>
+        <div>商户编号:{{ item.mchntCd }}</div>
       </el-card>
     </div>
     <el-divider></el-divider>
@@ -42,6 +61,7 @@
         <div class="mingc">功能状态</div>
         <el-switch
           v-model="value"
+          @change="changeStatus"
         >
         </el-switch>
       </div>
@@ -51,35 +71,50 @@
       <div><el-button type="primary" icon="el-icon-plus" @click="dialogFormVisible = true">添加规则</el-button></div>
       <div><el-button type="success" icon="el-icon-s-promotion" @click="open">发布规则</el-button></div>
     </div>
-    <div class="hangbox" v-for="(item,index) in 3" :key="index">
+    <div class="hangbox" v-for="(item,index) in oilConfigList" :key="item.id">
       <div>{{index + 1}}.通道</div>
-      <div class="jiaong"> 名称 </div>
+      <div class="jiaong">{{ item.merchantName }}</div>
       <div> 商户号 </div>
-      <div class="jiaong"> 1231213213212</div>
-      <div> 交易满 </div>
-      <div class="jiaong"> 2 </div>
-      <div> 笔更换支付通道 参与次数  </div>
+      <div class="jiaong">{{ item.mchntCd }}</div>
+<!--      <div> 交易满 </div>-->
+      <div> 交易占比 </div>
+      <div class="jiaong"> {{ item.proportion }} </div>
+      <div> %更换支付通道 参与次数  </div>
       <div class="jiaong"> 不固定次数 </div>
 
-      <el-button type="primary" icon="el-icon-edit">编辑</el-button>
+      <el-button type="primary" icon="el-icon-edit" @click="editOilConfig(item.id)">编辑</el-button>
       <el-button type="danger" icon="el-icon-close">删除</el-button>
     </div>
+<!--    <div class="hangbox" v-for="(item,index) in 3" :key="index">-->
+<!--      <div>{{index + 1}}.通道</div>-->
+<!--      <div class="jiaong"> 名称 </div>-->
+<!--      <div> 商户号 </div>-->
+<!--      <div class="jiaong"> 1231213213212</div>-->
+<!--&lt;!&ndash;      <div> 交易满 </div>&ndash;&gt;-->
+<!--      <div> 交易占比 </div>-->
+<!--      <div class="jiaong"> 2 </div>-->
+<!--      <div> %更换支付通道 参与次数  </div>-->
+<!--      <div class="jiaong"> 不固定次数 </div>-->
+
+<!--      <el-button type="primary" icon="el-icon-edit">编辑</el-button>-->
+<!--      <el-button type="danger" icon="el-icon-close">删除</el-button>-->
+<!--    </div>-->
     <div class="hsize">注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效</div>
 
     <el-dialog title="编辑通道规则" :visible.sync="dialogFormVisible">
       <el-form :model="form">
 
         <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
-          <el-select v-model="form.region" placeholder="请选择活动区域">
+          <el-select v-model="form.merchConfigId" placeholder="请选择活动区域">
             <el-option label="区域一" value="shanghai"></el-option>
             <el-option label="区域二" value="beijing"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="商户号" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="form.mchntCd" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="消费满笔数" :label-width="formLabelWidth">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
+          <el-input v-model="form.proportion" autocomplete="off"></el-input>
           <div>消费笔数满足后切换到下一个支付通道</div>
         </el-form-item>
         <el-form-item label="参与次数" :label-width="formLabelWidth">
@@ -107,10 +142,17 @@
 </template>
 
 <script>
+import {editMerchant, listMerchant} from "@/api/payConfig/merchantconfig";
+import {isOpenOilConfig, listOilConfig, oilConfigInfo} from "@/api/payConfig/oilconfig";
+
 export default {
   name: 'peizhi',
   data(){
     return{
+      // 商户配置信息
+      merchantList:[],
+      // 商品规则配置信息
+      oilConfigList:[],
       form: {
         name: '',
         region: '',
@@ -124,11 +166,73 @@ export default {
       },
       formLabelWidth: '120px',
       dialogFormVisible:false,
-      value:'false',
+      value:false,
+      value1:true,
       labelPosition: 'right',
     }
   },
+  created() {
+    this.getList();
+  },
   methods:{
+    // 修改支付配置信息
+    editOilConfig(id){
+      this.dialogFormVisible = true;
+      oilConfigInfo(id).then( response => {
+        this.form = response.data
+        console.log(response)
+      })
+    },
+    // 修改启用状态
+    changeStatus(){
+      if (this.value){
+        this.value1 = false;
+        isOpenOilConfig(1).then( response => {})
+      }else {
+        this.value1 = true;
+        isOpenOilConfig(0).then( response => {})
+      }
+    },
+    changeStatus1(){
+      if (this.value1){
+        this.value = false;
+        isOpenOilConfig(0).then( response => {})
+      }else {
+        this.value = true;
+        isOpenOilConfig(1).then( response => {})
+      }
+    },
+    // 修改商户使用状态
+    editStatus(data,isUse){
+      this.$confirm('确定将当前支付配置切换为商户号('+data.mchntCd+')吗?切换后实时生效!', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        data.isUse = isUse
+        editMerchant(data).then( response => {})
+        this.$message({
+          type: 'success',
+          message: '支付通道切换成功,已实时切换为商户号('+data.mchntCd+')'
+        });
+        this.getList();
+      }).catch(() => {});
+    },
+    // 获取商户列表信息
+    getList(){
+      listMerchant().then( response => {
+        this.merchantList = response.data;
+        this.merchantList.forEach(item => {
+          if (item.isOpenRule == "1"){
+            this.value1 = false;
+            this.value = true;
+          }
+        })
+      })
+      listOilConfig().then( response => {
+        this.oilConfigList = response.data;
+      })
+    },
     open() {
       this.$confirm('此操作会发布件, 是否继续?', '提示', {
         confirmButtonText: '确定',
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 7557db90a..c9435b376 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -66,21 +66,26 @@
 
     <el-card class="card">
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="21">
+          <span style="font-size: 18px">等级规则</span>
+          <span style="font-size: 14px">（最多支持20个等级）</span>
+        </el-col>
+        <el-col :span="3">
           <el-button
             type="primary"
             icon="el-icon-plus"
             @click="handleAdd"
           >新增会员等级</el-button>
         </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
       </el-row>
       <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column label="等级" prop="grade" width="55"/>
       <el-table-column label="等级名称" align="center" prop="name" />
-      <el-table-column label="汽油成长值" align="center" prop="gasoline" />
-      <el-table-column label="柴油成长值" align="center" prop="dieselOil" />
-      <el-table-column label="天然气成长值" align="center" prop="naturalGas" />
+      <el-table-column label="成长值" align="center" prop="growthValue" />
+<!--      <el-table-column label="汽油成长值" align="center" prop="gasoline" />-->
+<!--      <el-table-column label="柴油成长值" align="center" prop="dieselOil" />-->
+<!--      <el-table-column label="天然气成长值" align="center" prop="naturalGas" />-->
 <!--      <el-table-column label="升级条件值" align="center" prop="catchValue">-->
 <!--        <template slot-scope="scope">-->
 <!--          <span v-if="scope.row.catchValue > 0">-->
@@ -112,7 +117,7 @@
             <dict-tag :options="dict.type.yhlx" :value="scope.row.preferential"/>
           </template>
         </el-table-column>
-        <el-table-column label="特权信息"  width="180">
+        <el-table-column label="特权信息">
           <template slot-scope="scope">
             <div v-show="scope.row.preferential=='自定义优惠'">
               <p>
@@ -181,7 +186,9 @@
         </el-table-column>
         <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>
+<!--          <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
+          <el-tag v-if="scope.row.status == 'qy'">启用</el-tag>
+          <el-tag v-else type="info">禁用</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -230,37 +237,40 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="所需成长值" prop="gasoline">
-              <e-row>
-                <el-col :span="8">
-                  <el-form-item prop="gasoline">
-                    <el-input v-model="form.gasoline" placeholder="1">
-                      <template slot="prepend">汽油</template>
-                      <template slot="append">成长值</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </e-row>
-              <e-row>
-                <el-col :span="8">
-                  <el-form-item prop="dieselOil">
-                    <el-input v-model="form.dieselOil" placeholder="1">
-                      <template slot="prepend">柴油</template>
-                      <template slot="append">成长值</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </e-row>
-              <e-row>
-                <el-col :span="8">
-                  <el-form-item prop="naturalGas">
-                    <el-input v-model="form.naturalGas" placeholder="1">
-                      <template slot="prepend">天然气</template>
-                      <template slot="append">成长值</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </e-row>
+            <el-form-item label="所需成长值" prop="growthValue">
+              <el-input v-model="form.growthValue" placeholder="1">
+                <template slot="append">成长值</template>
+              </el-input>
+<!--              <e-row>-->
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item prop="gasoline">-->
+<!--                    <el-input v-model="form.gasoline" placeholder="1">-->
+<!--                      <template slot="prepend">汽油</template>-->
+<!--                      <template slot="append">成长值</template>-->
+<!--                    </el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--              </e-row>-->
+<!--              <e-row>-->
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item prop="dieselOil">-->
+<!--                    <el-input v-model="form.dieselOil" placeholder="1">-->
+<!--                      <template slot="prepend">柴油</template>-->
+<!--                      <template slot="append">成长值</template>-->
+<!--                    </el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--              </e-row>-->
+<!--              <e-row>-->
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item prop="naturalGas">-->
+<!--                    <el-input v-model="form.naturalGas" placeholder="1">-->
+<!--                      <template slot="prepend">天然气</template>-->
+<!--                      <template slot="append">成长值</template>-->
+<!--                    </el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
+<!--              </e-row>-->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
new file mode 100644
index 000000000..d04118bf2
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/MerchantConfigController.java
@@ -0,0 +1,42 @@
+package com.fuint.api.fuyou.controller;
+
+import com.fuint.api.fuyou.entity.MerchantConfig;
+import com.fuint.api.fuyou.service.MerchantConfigService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 商户配置信息 controller层
+ */
+@RestController
+@RequestMapping("/api/merchantConfig")
+public class MerchantConfigController extends BaseController {
+    @Autowired
+    private MerchantConfigService merchantConfigService;
+
+    /**
+     * 获取商户列表信息
+     * @return
+     */
+    @GetMapping("/list")
+    public ResponseObject list(){
+        List<MerchantConfig> list = merchantConfigService.selectMerchList();
+        return getSuccessResult(list);
+    }
+
+    /**
+     * 修改商户使用状态
+     * @param merchantConfig
+     * @return
+     */
+    @PutMapping
+    public ResponseObject edit(@Validated @RequestBody MerchantConfig merchantConfig){
+        int row = merchantConfigService.updateMerchStatus(merchantConfig);
+        return getSuccessResult(row);
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
new file mode 100644
index 000000000..cb923e2e9
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/OilConfigController.java
@@ -0,0 +1,57 @@
+package com.fuint.api.fuyou.controller;
+
+import com.fuint.api.fuyou.service.MerchantConfigService;
+import com.fuint.api.fuyou.service.OilConfigService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 支付配置信息 controller层
+ */
+@RestController
+@RequestMapping("/api/oilConfig")
+public class OilConfigController extends BaseController {
+    @Autowired
+    private OilConfigService oilConfigService;
+    @Autowired
+    private MerchantConfigService merchantConfigService;
+
+    /**
+     * 查询支付配置信息列表
+     * @return
+     */
+    @GetMapping("/list")
+    public ResponseObject list(){
+        return getSuccessResult(oilConfigService.selectOilConfigList());
+    }
+
+    /**
+     * 查看支付配置规则是否开启
+     * @param isOpen
+     * @return
+     */
+    @GetMapping("/{isOpen}")
+    public ResponseObject isOpen(@PathVariable String isOpen){
+        if (isOpen.equals("1")){
+            oilConfigService.oilRule();
+        }else {
+            merchantConfigService.updateMerchIsOpen("0");
+        }
+        return getSuccessResult(0);
+    }
+
+    /**
+     * 根据id查询支付配置信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/info/{id}")
+    public ResponseObject oilConfigInfo(@PathVariable Integer id){
+        return getSuccessResult(oilConfigService.selectOilConfigById(id));
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java
index 0d6b4cca0..3c38fd687 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/MerchantConfig.java
@@ -50,6 +50,10 @@ public class MerchantConfig extends BaseEntity implements Serializable {
      * 私钥
      */
     private String privateKey;
+    /**
+     * 是否使用当前账户收款：0不使用，1使用
+     */
+    private String isUse;
     /**
      * 是否开启规则：0不开启，1开启
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/OilConfig.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/OilConfig.java
new file mode 100644
index 000000000..4667e6dca
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/OilConfig.java
@@ -0,0 +1,44 @@
+package com.fuint.api.fuyou.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (OilConfig)实体类 支付配置规则表
+ */
+@Data
+@TableName("oil_config")
+@ApiModel(value = "OilConfig对象", description = "支付配置规则表")
+public class OilConfig implements Serializable {
+    private static final long serialVersionUID = -72940523083738137L;
+    /**
+     * 主键
+     */
+    private Integer id;
+    /**
+     * 油站id
+     */
+    private Integer storeId;
+    /**
+     * 商户配置id
+     */
+    private Integer merchConfigId;
+    /**
+     * 交易占比
+     */
+    private Integer proportion;
+    /**
+     * key值
+     */
+    private String keyStr;
+    /**
+     * value值
+     */
+    private String valueStr;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/OilConfigMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/OilConfigMapper.java
new file mode 100644
index 000000000..7a4c74119
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/OilConfigMapper.java
@@ -0,0 +1,26 @@
+package com.fuint.api.fuyou.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.api.fuyou.entity.OilConfig;
+import com.fuint.api.fuyou.vo.OilConfigVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 支付配置信息 Mapper层
+ */
+public interface OilConfigMapper extends BaseMapper<OilConfig> {
+    /**
+     * 查询油品配置列表信息
+     * @return
+     */
+    public List<OilConfigVo> selectOilConfigList();
+
+    /**
+     * 根据id查询支付配置信息
+     * @param id
+     * @return
+     */
+    public OilConfigVo selectOilConfigById(@Param("id") int id);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml
new file mode 100644
index 000000000..807e4d766
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/mapper/xml/OilConfigMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.api.fuyou.mapper.OilConfigMapper">
+    <sql id="selectOilConfig">
+        select oc.*,mc.mchnt_cd,mc.merchant_name from oil_config oc
+            inner join merchant_config mc on oc.merch_config_id = mc.id
+    </sql>
+
+    <select id="selectOilConfigList" resultType="com.fuint.api.fuyou.vo.OilConfigVo">
+        <include refid="selectOilConfig"></include>
+    </select>
+    <select id="selectOilConfigById" resultType="com.fuint.api.fuyou.vo.OilConfigVo" parameterType="int">
+        <include refid="selectOilConfig"></include>
+        <where>
+            oc.id = #{id}
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
index e8594184e..55c78fc14 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/MerchantConfigService.java
@@ -3,14 +3,56 @@ package com.fuint.api.fuyou.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.api.fuyou.entity.MerchantConfig;
 
+import java.util.List;
+
 /**
  * 商户配置信息 业务层
  */
 public interface MerchantConfigService extends IService<MerchantConfig> {
     /**
      * 根据店铺id查询商户信息
-     * @param storeId
+     * @param isUse
      * @return
      */
-    public MerchantConfig selectMeChByStoreId(int storeId);
+    public MerchantConfig selectMeChByIsUse(String isUse);
+
+    /**
+     * 根据店铺id查询商户信息
+     * @return
+     */
+    public List<MerchantConfig> selectMeChByIsOpen();
+
+    /**
+     * 查询所有商户配置信息
+     * @return
+     */
+    public List<MerchantConfig> selectMerchList();
+
+    /**
+     * 根据id查询商户信息
+     * @param id
+     * @return
+     */
+    public MerchantConfig selectMerchById(int id);
+
+    /**
+     * 修改商户使用状态
+     * @param merchantConfig
+     * @return
+     */
+    public int updateMerch(MerchantConfig merchantConfig);
+
+    /**
+     * 修改商户使用状态
+     * @param merchantConfig
+     * @return
+     */
+    public int updateMerchStatus(MerchantConfig merchantConfig);
+
+    /**
+     * 修改商户是否开启支付规则状态
+     * @param isOpenRule
+     * @return
+     */
+    public int updateMerchIsOpen(String isOpenRule);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
new file mode 100644
index 000000000..105c9e19b
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/OilConfigService.java
@@ -0,0 +1,30 @@
+package com.fuint.api.fuyou.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.api.fuyou.entity.OilConfig;
+import com.fuint.api.fuyou.vo.OilConfigVo;
+
+import java.util.List;
+
+/**
+ * 支付配置信息 业务层
+ */
+public interface OilConfigService extends IService<OilConfig> {
+    /**
+     * 规则配置
+     */
+    public void oilRule();
+
+    /**
+     * 查询油品配置信息
+     * @return
+     */
+    public List<OilConfigVo> selectOilConfigList();
+
+    /**
+     * 根据id查询支付配置信息
+     * @param id
+     * @return
+     */
+    public OilConfigVo selectOilConfigById(int id);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
index 225ae1860..cdc67d54d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java
@@ -5,19 +5,76 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.api.fuyou.entity.MerchantConfig;
 import com.fuint.api.fuyou.mapper.MerchantConfigMapper;
 import com.fuint.api.fuyou.service.MerchantConfigService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 商户配置信息 业务层
  */
 @Service
 public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper, MerchantConfig> implements MerchantConfigService {
     @Override
-    public MerchantConfig selectMeChByStoreId(int storeId) {
+    public MerchantConfig selectMeChByIsUse(String isUse) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("store_id",storeId);
-        queryWrapper.eq("is_open_rule",0);
+        queryWrapper.eq("is_use",isUse);
         MerchantConfig merchantConfig = baseMapper.selectOne(queryWrapper);
         return merchantConfig;
     }
+
+    @Override
+    public List<MerchantConfig> selectMeChByIsOpen() {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_open_rule","1");
+        List list = baseMapper.selectList(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public List<MerchantConfig> selectMerchList() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",storeId);
+        List list = baseMapper.selectList(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public MerchantConfig selectMerchById(int id) {
+        MerchantConfig merchantConfig = baseMapper.selectById(id);
+        return merchantConfig;
+    }
+
+    @Override
+    public int updateMerch(MerchantConfig merchantConfig) {
+        int row = baseMapper.updateById(merchantConfig);
+        return row;
+    }
+
+    @Override
+    public int updateMerchStatus(MerchantConfig merchantConfig) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_use",1);
+        List<MerchantConfig> list = baseMapper.selectList(queryWrapper);
+        for (MerchantConfig config : list) {
+            config.setIsUse("0");
+            baseMapper.updateById(config);
+        }
+        int row = baseMapper.updateById(merchantConfig);
+        return row;
+    }
+
+    @Override
+    public int updateMerchIsOpen(String isOpenRule) {
+        List<MerchantConfig> list = baseMapper.selectList(null);
+        int row = 0;
+        for (MerchantConfig merchantConfig : list) {
+            merchantConfig.setIsOpenRule(isOpenRule);
+            row = baseMapper.updateById(merchantConfig);
+        }
+        return row;
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
new file mode 100644
index 000000000..9964fe081
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
@@ -0,0 +1,66 @@
+package com.fuint.api.fuyou.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.api.fuyou.entity.MerchantConfig;
+import com.fuint.api.fuyou.entity.OilConfig;
+import com.fuint.api.fuyou.mapper.OilConfigMapper;
+import com.fuint.api.fuyou.service.MerchantConfigService;
+import com.fuint.api.fuyou.service.OilConfigService;
+import com.fuint.api.fuyou.vo.OilConfigVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 支付配置信息 业务层
+ */
+@Service
+public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig> implements OilConfigService {
+    @Autowired
+    private MerchantConfigService merchantConfigService;
+
+    @Override
+    public void oilRule() {
+        List<OilConfig> list = baseMapper.selectList(null);
+        Double amountAll = 0.0;
+//        百分占比
+        List<Double> proList = new ArrayList<>();
+//        radio
+        List<Double> radioList = new ArrayList<>();
+//        距离
+        List<Double> distanceList = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            MerchantConfig merchantConfig = merchantConfigService.selectMerchById(list.get(i).getMerchConfigId());
+            amountAll += merchantConfig.getAmount();
+            proList.add((double) (list.get(i).getProportion()/100));
+            radioList.add(merchantConfig.getAmount()/amountAll);
+            distanceList.add(proList.get(i) - radioList.get(i));
+        }
+        int index = 0;
+        Double max = Collections.max(distanceList);
+        for (int i = 0; i<distanceList.size(); i++) {
+            if (distanceList.get(i)==max){
+                index = i;
+            }
+        }
+        MerchantConfig merchantConfig = merchantConfigService.selectMerchById(list.get(index).getMerchConfigId());
+        merchantConfig.setIsUse("1");
+        merchantConfig.setIsOpenRule("1");
+        merchantConfigService.updateMerch(merchantConfig);
+    }
+
+    @Override
+    public List<OilConfigVo> selectOilConfigList() {
+        List<OilConfigVo> oilConfigs = baseMapper.selectOilConfigList();
+        return oilConfigs;
+    }
+
+    @Override
+    public OilConfigVo selectOilConfigById(int id) {
+        OilConfigVo oilConfigVo = baseMapper.selectOilConfigById(id);
+        return oilConfigVo;
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/vo/OilConfigVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/vo/OilConfigVo.java
new file mode 100644
index 000000000..90e3728d3
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/vo/OilConfigVo.java
@@ -0,0 +1,10 @@
+package com.fuint.api.fuyou.vo;
+
+import com.fuint.api.fuyou.entity.OilConfig;
+import lombok.Data;
+
+@Data
+public class OilConfigVo extends OilConfig {
+    private String merchantName;
+    private String mchntCd;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
new file mode 100644
index 000000000..5bdd02eb8
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
@@ -0,0 +1,55 @@
+package com.fuint.business.order.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 余额变化记录表(CardBalanceChange)实体类
+ */
+@Data
+@TableName("card_balance_change")
+@ApiModel(value = "CardBalanceChange对象", description = "余额变化记录表")
+public class CardBalanceChange extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键id
+     */
+    @ApiModelProperty("自增ID")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    /**
+     * 连锁店id
+     */
+    private Integer chainStoreId;
+    /**
+     * 油站id
+     */
+    private Integer storeId;
+    /**
+     * 余额变化类型 0：-减少 1：增加
+     */
+    private String changeType;
+    /**
+     * 消费来源
+     */
+    private String fromType;
+    /**
+     * 余额变化值
+     */
+    private Double balance;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
new file mode 100644
index 000000000..d8fb71634
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
@@ -0,0 +1,7 @@
+package com.fuint.business.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fuint.business.order.entity.CardBalanceChange;
+
+public interface CardBalanceChangeMapper extends BaseMapper<CardBalanceChange> {
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
new file mode 100644
index 000000000..587cf9077
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
@@ -0,0 +1,13 @@
+package com.fuint.business.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.business.order.entity.CardBalanceChange;
+
+public interface CardBalanceChangeService extends IService<CardBalanceChange> {
+    /**
+     * 添加用户余额变化信息
+     * @param cardBalanceChange
+     * @return
+     */
+    public int insertCardBalance(CardBalanceChange cardBalanceChange);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
new file mode 100644
index 000000000..4a356109d
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
@@ -0,0 +1,21 @@
+package com.fuint.business.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.mapper.CardBalanceChangeMapper;
+import com.fuint.business.order.service.CardBalanceChangeService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CardBalanceChangeServiceImpl extends ServiceImpl<CardBalanceChangeMapper, CardBalanceChange> implements CardBalanceChangeService {
+    @Override
+    public int insertCardBalance(CardBalanceChange cardBalanceChange) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        cardBalanceChange.setStoreId(storeId);
+        int row = baseMapper.insert(cardBalanceChange);
+        return row;
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index b08ccf7b2..8de60b70e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -10,20 +10,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.api.fuyou.entity.MerchantConfig;
 import com.fuint.api.fuyou.service.FyPayService;
 import com.fuint.api.fuyou.service.MerchantConfigService;
-import com.fuint.business.order.entity.CashierOrder;
-import com.fuint.business.order.entity.LJOrder;
-import com.fuint.business.order.entity.OilOrder;
-import com.fuint.business.order.entity.OrderGoods;
+import com.fuint.api.fuyou.service.OilConfigService;
+import com.fuint.business.order.entity.*;
 import com.fuint.business.order.mapper.OilOrderMapper;
-import com.fuint.business.order.service.CashierOrderService;
-import com.fuint.business.order.service.LJOrderService;
-import com.fuint.business.order.service.OilOrderService;
-import com.fuint.business.order.service.OrderGoodsService;
+import com.fuint.business.order.service.*;
 import com.fuint.business.order.vo.OilOrderVo;
+import com.fuint.business.petrolStationManagement.entity.OilName;
+import com.fuint.business.petrolStationManagement.service.OilNameService;
+import com.fuint.business.userManager.entity.LJUser;
+import com.fuint.business.userManager.entity.LJUserGrade;
 import com.fuint.business.userManager.entity.UserBalance;
+import com.fuint.business.userManager.service.LJUserGradeService;
+import com.fuint.business.userManager.service.LJUserService;
 import com.fuint.business.userManager.service.UserBalanceService;
 import com.fuint.common.dto.AccountInfo;
 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;
 
@@ -44,6 +46,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     private UserBalanceService userBalanceService;
     @Autowired
     private CashierOrderService cashierOrderService;
+    @Autowired
+    private OilNameService oilNameService;
+    @Autowired
+    private CardBalanceChangeService cardBalanceChangeService;
+    @Autowired
+    private OilConfigService oilConfigService;
 
     @Override
     public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
@@ -114,13 +122,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 //            会员id
             userId = Integer.valueOf(map.get("userId"));
 
-//        根据用户id查询用户余额信息
-            UserBalance balance = userBalanceService.selectUserBalance(userId);
-//            修改余额信息
-            double beforeBalance = balance.getCardBalance();
-            double afterBalance = beforeBalance - consumeAmount;
-            balance.setCardBalance(afterBalance);
-            userBalanceService.updateUserBalance(balance);
+            this.insertCardBalance(consumeAmount,userId);
         }
 //        优惠券id
         Integer couponId = null;
@@ -190,6 +192,9 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                     order.setOrderNo(orderNo+"1");
                 }
 
+                if (userId!=null){
+                    this.updateGrowthValue(oilActualPay, userId, Integer.valueOf(jsonObjects.get(i).get("oilName").toString()));
+                }
                 order.setStoreId(storeId);
                 order.setUserId(userId);
                 order.setCouponId(couponId);
@@ -253,8 +258,13 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 //        如果金额不等于0调用第三方支付接口
         if (!map.get("allAmount").equals("0") && !map.get("payType").equals("CASH")){
             Integer allAmount = (int) (Double.valueOf(map.get("allAmount"))*100);
-    //        根据店铺id查询商户配置信息
-            MerchantConfig merchantConfig = merchantConfigService.selectMeChByStoreId(storeId);
+//            判断是否开启支付规则
+            List<MerchantConfig> list = merchantConfigService.selectMeChByIsOpen();
+            if (list.size()>0){
+                oilConfigService.oilRule();
+            }
+            //        根据店铺id查询商户配置信息
+            MerchantConfig merchantConfig = merchantConfigService.selectMeChByIsUse("1");
     //        处理支付需要的数据
             Map<String,String> map1 = new HashMap<>();
             map1.put("authCode",map.get("authCode"));
@@ -295,4 +305,95 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         int row = baseMapper.updateById(order);
         return row;
     }
+
+    @Autowired
+    private SysConfigService sysConfigService;
+    @Autowired
+    private LJUserService userService;
+    @Autowired
+    private LJUserGradeService userGradeService;
+
+    /**
+     * 修改用户成长值信息
+     */
+    private void updateGrowthValue(Double oilActualPay,Integer userid,Integer oilId){
+        if (oilId!=null){
+            OilName oilName = oilNameService.selectOilNameById(oilId);
+//            获取成长值增长数值
+            Integer gasGrowthValue = null;
+            Integer dieselGrowthValue = null;
+            Integer naturalGrowthValue = null;
+//            根据id查询会员信息 获取会员当前成长值数据
+            LJUser user = userService.selectUserById(userid);
+            int growth = user.getGrowthValue();
+//            查询会员等级列表信息
+            Page page = new Page(1,20);
+            LJUserGrade ljUserGrade1 = new LJUserGrade();
+            IPage<LJUserGrade> ljUserGradeIPage = userGradeService.selectUserGradeList(page, ljUserGrade1);
+            List<LJUserGrade> records = ljUserGradeIPage.getRecords();
+            if (oilName.getOilType().equals("汽油")){
+                gasGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("gas_growth_value"));
+                Integer addVal = (int) (gasGrowthValue * oilActualPay);
+                Integer growthAfter = growth + addVal;
+//                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
+                for (int i = 0; i < records.size(); i++){
+                    if ((growthAfter-records.get(i).getGrowthValue())<100){
+                        user.setGradeId(records.get(i).getId());
+                    }
+                    if (growthAfter>records.get(records.size()-1).getGrowthValue()){
+                        user.setGradeId(records.get(records.size()-1).getId());
+                    }
+                }
+                user.setGrowthValue(growthAfter);
+            }else if(oilName.getOilType().equals("柴油")){
+                dieselGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("diesel_growth_value"));
+                Integer addVal = (int) (dieselGrowthValue * oilActualPay);
+                Integer growthAfter = growth + addVal;
+//                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
+                for (int i = 0; i < records.size(); i++){
+                    if ((growthAfter-records.get(i).getGrowthValue())<100 && (growthAfter-records.get(i).getGrowthValue())>0){
+                        user.setGradeId(records.get(i).getId());
+                    }
+                    if (growthAfter > records.get(records.size()-1).getGrowthValue()){
+                        user.setGradeId(records.get(records.size()-1).getId());
+                    }
+                }
+                user.setGrowthValue(growthAfter);
+            }else{
+                naturalGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("natural_growth_value"));
+                Integer addVal = (int) (naturalGrowthValue * oilActualPay);
+                Integer growthAfter = growth + addVal;
+//                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
+                for (int i = 0; i < records.size(); i++){
+                    if ((growthAfter-records.get(i).getGrowthValue())<100){
+                        user.setGradeId(records.get(i).getId());
+                    }
+                    if (growthAfter>records.get(records.size()-1).getGrowthValue()){
+                        user.setGradeId(records.get(records.size()-1).getId());
+                    }
+                }
+                user.setGrowthValue(growthAfter);
+            }
+//            修改用户成长值
+            userService.updateUser(user);
+        }
+    }
+
+    private void insertCardBalance(Double amount,Integer userId){
+        //        根据用户id查询用户余额信息
+        UserBalance balance = userBalanceService.selectUserBalance(userId);
+//            修改余额信息
+        Double beforeBalance = balance.getCardBalance();
+        Double afterBalance = beforeBalance - amount;
+        balance.setCardBalance(afterBalance);
+        userBalanceService.updateUserBalance(balance);
+//        添加余额记录信息
+        CardBalanceChange cardBalanceChange = new CardBalanceChange();
+        cardBalanceChange.setUserId(userId);
+        cardBalanceChange.setChangeType("0");
+        cardBalanceChange.setFromType("油品订单消费");
+        cardBalanceChange.setBalance(amount);
+
+        cardBalanceChangeService.insertCardBalance(cardBalanceChange);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNameController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNameController.java
index 241c39128..b6e125abf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNameController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/controller/OilNameController.java
@@ -38,6 +38,11 @@ public class OilNameController extends BaseController {
         return getSuccessResult(oilNameService.oilNameListByType(oilName));
     }
 
+    /**
+     * 根据id查询油品信息
+     * @param id
+     * @return
+     */
     @GetMapping("/{id}")
     public ResponseObject oilNameInfo(@PathVariable Integer id){
         return getSuccessResult(oilNameService.selectOilNameById(id));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java
index 507303a64..6c6d0cf42 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUser.java
@@ -58,7 +58,10 @@ public class LJUser extends BaseEntity implements Serializable {
     private String idcard;
 
     @ApiModelProperty("等级ID")
-    private String gradeId;
+    private Integer gradeId;
+
+    @ApiModelProperty("成长值")
+    private Integer growthValue;
 
     @ApiModelProperty("性别 1男,0女")
     private Integer sex;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java
index 92dd3080f..e7c3b7d81 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java
@@ -42,30 +42,12 @@ public class LJUserGrade extends BaseEntity implements Serializable {
     @ApiModelProperty("等级名称")
     private String name;
 
-    @ApiModelProperty("升级会员等级条件描述")
-    private String catchCondition;
-
-    @ApiModelProperty("升级会员等级条件，init:默认获取;pay:付费升级；frequency:消费次数；amount:累积消费金额升级")
-    private String catchType;
-
-    @ApiModelProperty("达到升级条件的值")
-    private BigDecimal catchValue;
-
-    @ApiModelProperty("会员权益描述")
-    private String userPrivilege;
-
-    @ApiModelProperty("有效期")
-    private Integer validDay;
-
-    @ApiModelProperty("享受折扣")
-    private Float discount;
-
-    @ApiModelProperty("积分加速")
-    private Float speedPoint;
-
     @ApiModelProperty("状态")
     private String status;
 
+    @ApiModelProperty("成长值")
+    private Integer growthValue;
+
     @ApiModelProperty("汽油成长值")
     private Integer gasoline;
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml
index 0be44fd01..33aee1c2f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserGradeMapper.xml
@@ -9,18 +9,6 @@
         <include refid="selectUserGrade"></include>
         <where>
             store_id = #{userGrade.storeId}
-<!--            <if test="userGrade.mobile != null and userGrade.mobile != ''">-->
-<!--                and mobile like concat('%', #{userGrade.mobile}, '%')-->
-<!--            </if>-->
-<!--            <if test="userGrade.userNo != null and userGrade.userNo != ''">-->
-<!--                and user_no like concat('%', #{userGrade.userNo}, '%')-->
-<!--            </if>-->
-<!--            <if test="userGrade.name != null and userGrade.name != ''">-->
-<!--                and name like concat('%', #{userGrade.name}, '%')-->
-<!--            </if>-->
-<!--            <if test="userGrade.gradeId != null and userGrade.gradeId != ''">-->
-<!--                and grade_id = #{userGrade.gradeId}-->
-<!--            </if>-->
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
index 18aabae2e..3bd6901c3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/vo/LJUserVo.java
@@ -40,7 +40,7 @@ public class LJUserVo extends BaseEntity {
     private String idcard;
 
 //    等级ID
-    private String gradeId;
+    private Integer gradeId;
 
 //    性别 1男,0女
     @ExcelProperty(value = "性别",converter = GenderConverter.class)
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index e0780f775..8a3e0f76f 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -982,9 +982,9 @@
         this.map.goodsOrder = JSON.stringify(this.goodsOrder);
         this.map.authCode = this.authCode;
         this.map.allAmount = this.oilActualPay + this.goodsActualPay;
+        this.map.consumeAmount = this.consumeAmount;
 
         let _this = this;
-        console.log(this.oilOrder)
         addLJGoods(_this.map).then( response => {
           if (response.data.oilOrder!=null){
             _this.orderNo = response.data.oilOrder.orderNo;
@@ -1022,7 +1022,46 @@
           _this.consumeAmount = 0;
           _this.oilTotal = 0;
           _this.goodsTotal = 0;
-        }
+        };
+        this.map = {
+          allAmount:0,
+            // 用户支付条码信息
+            authCode:'',
+            // 油品订单
+            oilOrder:"",
+            // 商品订单
+            goodsOrder:"",
+            // 支付方式
+            payType:"WECHAT",
+            // 油品订单金额
+            oilAmount:0,
+            // 商品订单金额
+            goodsAmount:0,
+            // 油品实付金额
+            oilActualPay:0,
+            // 商品实付金额
+            goodsActualPay:0,
+            // 付款用户
+            payUser:"",
+            // 油品优惠金额
+            oilDiscount:0,
+            // 商品优惠金额
+            goodsDiscount:0,
+            // 优惠券id
+            couponId:"",
+            // 提成金额
+            commissionAmount:0,
+            // 使用积分数量
+            usePoint:0,
+            // 积分金额
+            pointAmount:0,
+            // 终端
+            terminal:"PC",
+            // 商品数量
+            goodsNum:0,
+            // 会员消费金额（储值卡需要减少的金额）
+            consumeAmount:0,
+        };
       },
       // 查询订单支付状态
       queryPayStatus(){