From eae119f033a088f3c74dd998f9438ebfbaa7cbda Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 5 Jan 2024 18:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/.env.development                   |   3 +-
 fuintAdmin/.env.production                    |   2 +-
 fuintAdmin/.env.staging                       |   2 +-
 .../src/views/convenienceStore/goodsFile.vue  |   2 +-
 fuintAdmin/src/views/member/fixingLevel.vue   |  76 +-
 fuintAdmin/src/views/member/index.vue         |  16 +-
 fuintAdmin/src/views/staff/list.vue           |  23 +-
 fuintAdmin/src/views/userGrade/index.vue      |   4 +-
 fuintAdmin_zt/.env.development                |   3 +-
 fuintAdmin_zt/.env.production                 |   2 +-
 fuintAdmin_zt/src/main.js                     |   2 +-
 fuintAdmin_zt/src/views/Site/index.vue        |  13 +
 .../configure/dev/application.properties      |   2 +-
 .../configure/prod/application.properties     | 136 ++--
 .../impl/MerchantConfigServiceImpl.java       |   4 +-
 .../controller/IndexBannerController.java     |   2 +-
 .../service/IndexBannerService.java           |   2 +-
 .../service/impl/IndexBannerServiceImpl.java  |  14 +-
 .../member/service/ILJStaffService.java       |   3 +
 .../service/impl/LJStaffServiceImpl.java      |  43 +-
 .../controller/QRCodeController.java          |   4 +-
 .../service/ILJStoreService.java              |   7 +
 .../service/IQRCodeService.java               |   8 +-
 .../service/impl/LJStoreServiceImpl.java      |   7 +
 .../service/impl/QRCodeServiceImpl.java       |  20 +-
 .../controller/LJUserGradeController.java     |   2 +-
 .../service/LJUserGradeService.java           |   2 +-
 .../service/impl/LJUserGradeServiceImpl.java  |   9 +-
 .../service/impl/LJUserServiceImpl.java       |   4 +-
 .../fuint/common/service/AccountService.java  |  13 +-
 .../service/impl/AccountServiceImpl.java      |  13 +-
 .../dept/controller/SysDeptController.java    |  31 +-
 .../system/dept/service/ISysDeptService.java  |   6 +
 .../dept/service/impl/SysDeptServiceImpl.java |   8 +
 .../controller/BackendAccountController.java  |  15 +-
 .../src/main/resources/application.properties |   6 +-
 .../java/com/fuint/paymentApplication.java    |   7 +
 .../com/fuint/repository/model/TAccount.java  |   2 +
 fuintCashierWeb/.env.development              | Bin 288 -> 289 bytes
 fuintCashierWeb/.env.production               |   2 +-
 gasStation-uni/package-lock.json              | 649 +++++++++++++++++-
 gasStation-uni/pages/index/index.vue          |  39 +-
 gasStation-uni/pages/refuel/refuel.vue        |  39 +-
 43 files changed, 1059 insertions(+), 188 deletions(-)
 create mode 100644 fuintBackend/fuint-payment/src/main/java/com/fuint/paymentApplication.java

diff --git a/fuintAdmin/.env.development b/fuintAdmin/.env.development
index eb8a642a0..d521d666a 100644
--- a/fuintAdmin/.env.development
+++ b/fuintAdmin/.env.development
@@ -11,6 +11,5 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.0.138:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.0.121:8080/'
 
-# http://192.168.1.6:8008/
diff --git a/fuintAdmin/.env.production b/fuintAdmin/.env.production
index 90bc2956b..c3a1ccc9a 100644
--- a/fuintAdmin/.env.production
+++ b/fuintAdmin/.env.production
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.1.5:8080/'
+VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
diff --git a/fuintAdmin/.env.staging b/fuintAdmin/.env.staging
index dbd3232c0..859915866 100644
--- a/fuintAdmin/.env.staging
+++ b/fuintAdmin/.env.staging
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/stage-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.1.5:8080/'
+VUE_APP_SERVER_URL = 'http://192.168.0.121:8080/'
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index a3bd52308..b9b989381 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -283,7 +283,7 @@
                 style="width: 94%"
                 v-model="supplier"
                 :fetch-suggestions="querySearch"
-                placeholder="供应商名称"
+                placeholder="供应商名称，如果是未添加的供应商，输完名称点回车即自动添加"
                 @change="addSupplier"
                 @select="selectSupplier">
                 <template slot-scope="{ item }">
diff --git a/fuintAdmin/src/views/member/fixingLevel.vue b/fuintAdmin/src/views/member/fixingLevel.vue
index 7bf02fcee..6ed1ad087 100644
--- a/fuintAdmin/src/views/member/fixingLevel.vue
+++ b/fuintAdmin/src/views/member/fixingLevel.vue
@@ -284,11 +284,11 @@
                 <dict-tag :options="dict.type.yes_or_no" :value="scope.row.pointRule"/>
               </template>
             </el-table-column>
-            <el-table-column label="加油金" align="center" prop="refuelMoneyRule">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.yes_or_no" :value="scope.row.refuelMoneyRule"/>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="加油金" align="center" prop="refuelMoneyRule">-->
+<!--              <template slot-scope="scope">-->
+<!--                <dict-tag :options="dict.type.yes_or_no" :value="scope.row.refuelMoneyRule"/>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="成长值" align="center" prop="growthValueRule">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.yes_or_no" :value="scope.row.growthValueRule"/>
@@ -715,21 +715,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="加油金参与" prop="refuelMoneyRule">
-              <el-radio-group v-model="form.refuelMoneyRule">
-                <el-radio label="yes">参与</el-radio>
-                <el-radio label="no">不参与</el-radio>
-              </el-radio-group>
-              <div>
-                <div style="color: grey;font-size: 12px;height: 18px">
-                  启用参与后将参与加油金的获得和使用,相反则无法获得加油金且无法使用
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="加油金参与" prop="refuelMoneyRule">-->
+<!--              <el-radio-group v-model="form.refuelMoneyRule">-->
+<!--                <el-radio label="yes">参与</el-radio>-->
+<!--                <el-radio label="no">不参与</el-radio>-->
+<!--              </el-radio-group>-->
+<!--              <div>-->
+<!--                <div style="color: grey;font-size: 12px;height: 18px">-->
+<!--                  启用参与后将参与加油金的获得和使用,相反则无法获得加油金且无法使用-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="成长值参与" prop="growthValueRule">
@@ -775,21 +775,21 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="认证审核" prop="process">
-              <el-radio-group v-model="form.process">
-                <el-radio label="sh">审核</el-radio>
-                <el-radio label="bsh">不审核</el-radio>
-              </el-radio-group>
-              <div>
-                <div style="color: grey;font-size: 12px;height: 18px">
-                  专车二维码用户扫码提交认证后是否需要审核
-                </div>
-              </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="认证审核" prop="process">-->
+<!--              <el-radio-group v-model="form.process">-->
+<!--                <el-radio label="sh">审核</el-radio>-->
+<!--                <el-radio label="bsh">不审核</el-radio>-->
+<!--              </el-radio-group>-->
+<!--              <div>-->
+<!--                <div style="color: grey;font-size: 12px;height: 18px">-->
+<!--                  专车二维码用户扫码提交认证后是否需要审核-->
+<!--                </div>-->
+<!--              </div>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row>
           <el-col :span="24">
             <el-form-item label="类型状态" prop="status">
@@ -1089,7 +1089,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "新增认证类型";
+      this.title = "新增固定等级类型";
     },
     // 新增按钮操作
     handleAddMember() {
@@ -1166,7 +1166,7 @@ export default {
       getFixingLevel(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "编辑认证类型";
+        this.title = "编辑固定等级类型";
       });
     },
     // 修改按钮操作
@@ -1373,7 +1373,7 @@ export default {
   .roll-dialog ::v-deep .el-dialog .el-dialog__body {
     padding: 3px 30px;
     overflow-y: scroll;
-    height: 500px;
+    height: 600px;
   }
   .avatar{
     width: 100%;
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index e1bf90fe3..004f5c5fb 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -726,11 +726,17 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改会员成功");
-              this.open = false;
-              this.getList();
-            });
+            getUserPhone({mobile:this.form.mobile}).then( response => {
+              if (response.data) {
+                this.$modal.msgError("手机号已存在");
+              } else {
+                updateUser(this.form).then(response => {
+                  this.$modal.msgSuccess("修改会员成功");
+                  this.open = false;
+                  this.getList();
+                });
+              }
+            })
           } else {
             getUserPhone({mobile:this.form.mobile}).then( response => {
               if(response.data){
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index a8e53cec6..419df75f0 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -917,11 +917,24 @@ export default {
               }
             })
           } else {
-            updateStaff(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+            // queryStaff({mobile:this.form.mobile}).then( response => {
+            //   if (response.data != null) {
+            //     this.$modal.msgError("手机号已存在");
+            //   } else {
+            //     this.form.posPrem = JSON.stringify(this.form.posPrem);
+            //     this.form.appletPrem = JSON.stringify(this.form.appletPrem);
+                updateStaff(this.form).then(response => {
+                  if (response.data==1){
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.getList();
+                  }else {
+                    this.$modal.msgError("手机号已存在");
+                  }
+
+                });
+            //   }
+            // })
           }
         }
       });
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 2d12e48fd..712954785 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -523,7 +523,7 @@ export default {
       // 默认排序
       defaultSort: {prop: 'createTime', order: 'descending'},
       // 表单参数
-      form: { id: '', grade: 0, name: '',gasoline:1,dieselOil:1,naturalGas:1,preferential:'自定义优惠',
+      form: { id: '', grade: "", name: '',gasoline:1,dieselOil:1,naturalGas:1,preferential:'自定义优惠',
         gasolineDiscount:'无优惠',dieselDiscount:'无优惠',naturalGasDiscount:'无优惠',promotionGroup:'',
         // catchCondition: '', userPrivilege: '', catchType: '', catchValue: '', validDay: '',discount: '', speedPoint: '',
         status: 'qy' },
@@ -738,7 +738,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: '', grade: 0, name: '',gasoline:1,dieselOil:1,naturalGas:1,preferential:'自定义优惠',
+        id: '', grade: "", name: '',gasoline:1,dieselOil:1,naturalGas:1,preferential:'自定义优惠',
           gasolineDiscount:'无优惠',dieselDiscount:'无优惠',naturalGasDiscount:'无优惠',promotionGroup:'',
           status: 'qy'
       };
diff --git a/fuintAdmin_zt/.env.development b/fuintAdmin_zt/.env.development
index b4d6f2162..3d8a1c49b 100644
--- a/fuintAdmin_zt/.env.development
+++ b/fuintAdmin_zt/.env.development
@@ -11,8 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_APP_PUBLIC_PATH = '/'
 
 # 后端接口地址
-# VUE_APP_SERVER_URL = 'http://192.168.0.138:8080/'
-VUE_APP_SERVER_URL = 'http://192.168.0.178:8008/'
+VUE_APP_SERVER_URL = 'http://192.168.0.121:8080/'
 
 # cp端地址
 VUE_PC_SERVER_URL = 'http://192.168.0.178:82/'
diff --git a/fuintAdmin_zt/.env.production b/fuintAdmin_zt/.env.production
index 5c27b7606..0e94c09a0 100644
--- a/fuintAdmin_zt/.env.production
+++ b/fuintAdmin_zt/.env.production
@@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'http://192.168.1.6:8008/'
+VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
 
 # cp端地址
 VUE_PC_SERVER_URL = 'http://192.168.1.6:82/'
diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js
index 029c93f67..991ff526a 100644
--- a/fuintAdmin_zt/src/main.js
+++ b/fuintAdmin_zt/src/main.js
@@ -47,7 +47,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.getName = getName
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
-Vue.prototype.pcUrl = 'http://192.168.0.178:82/'
+Vue.prototype.pcUrl = 'http://192.168.0.121:82/'
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index f41a3fe6d..9d4cc9288 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -243,6 +243,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="手机号" prop="mobile">
+              <el-input v-model="form.mobile" placeholder="请输入手机号" maxlength="50" autocomplete="off" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
 
         <template v-if="title == '新增用户'">
@@ -483,9 +490,15 @@
           leaderName: [
             { required: true, message: '姓名不能为空', trigger: 'blur' },
           ],
+          accountName: [
+            { required: true, message: '用户名不能为空', trigger: 'blur' },
+          ],
           leaderPhone: [
             { required: true, message: '电话不能为空', trigger: 'blur' },
           ],
+          mobile: [
+            { required: true, message: '手机号不能为空', trigger: 'blur' },
+          ],
 
           deptName: [
             { required: true, message: '请输入节点名称', trigger: 'blur' },
diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index 2638e6ff0..428182e8c 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -39,7 +39,7 @@ system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
 website.url=https://www.fuint.cn/h5/
 
 # \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
-images.root=C:/fuintV3.0.1/fuintBackend/fuint-application/target/classes
+images.root=d:/rouyi/uploadPath
 images.path=/static/uploadImages/
 
 # \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
diff --git a/fuintBackend/configure/prod/application.properties b/fuintBackend/configure/prod/application.properties
index c2f62f93b..bf8f2a8ca 100644
--- a/fuintBackend/configure/prod/application.properties
+++ b/fuintBackend/configure/prod/application.properties
@@ -1,104 +1,126 @@
-# 数据库配置
-spring.datasource.url=jdbc:mysql://localhost:3306/fuint-db?useUnicode=true&characterEncoding=UTF8&useSSL=false
-spring.datasource.username=root
-spring.datasource.password=root
+# \u6570\u636E\u5E93\u914D\u7F6E
 
-# Redis配置
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/oilSystem?useUnicode=true&characterEncoding=UTF8&useSSL=false&allowMultiQueries=true
+
+spring.datasource.username=oilSystem
+spring.datasource.password=qqzcy@1014
+
+#spring.datasource.url=jdbc:mysql://localhost:3306/fuint-db?useUnicode=true&characterEncoding=UTF8&useSSL=false&allowMultiQueries=true
+#spring.datasource.username=root
+#spring.datasource.password=root
+
+
+# Redis\u914D\u7F6E
 spring.session.store-type=redis
 spring.session.redis.namespace=fuint
-# Redis数据库索引（默认为0）
-spring.redis.database=0 
-# Redis服务器地址(生产)
-spring.redis.host=127.0.0.1
-# Redis服务器连接端口
+# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
+spring.redis.database=0
+# Redis\u670D\u52A1\u5668\u5730\u5740(\u751F\u4EA7)
+spring.redis.host=localhost
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
 spring.redis.port=6379
-# Redis服务器连接密码（默认为空）
+# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=
-# 连接池最大连接数（使用负值表示没有限制）
+# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.pool.max-active=-1
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
-spring.redis.pool.max-wait=-1 
-# 连接池中的最大空闲连接
-spring.redis.pool.max-idle=8 
-# 连接池中的最小空闲连接
-spring.redis.pool.min-idle=0 
-# 连接超时时间（毫秒）
-spring.redis.timeout=0
+# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
+spring.redis.pool.max-wait=-1
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.pool.max-idle=8
+# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
+spring.redis.pool.min-idle=0
+# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
+spring.redis.timeout=5000
 
-# 系统名称
-system.name = fuint会员营销管理系统
+# \u7CFB\u7EDF\u540D\u79F0
+system.name = \u84DD\u9CB8\u667A\u6167\u6CB9\u7AD9\u7CFB\u7EDF
 
-# 前端h5地址
+# \u524D\u7AEFh5\u5730\u5740
 website.url=https://www.fuint.cn/h5/
 
-# 上传图片本地地址
-images.root=/www/wwwroot/www.xxx.com
+# \u4E0A\u4F20\u56FE\u7247\u672C\u5730\u5730\u5740
+images.root=/www/wwwroot/shenlanshuke/oilAdmin
 images.path=/static/uploadImages/
 
-# 上传图片服务器域名
+# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
 images.upload.url=http://localhost:8080
 
-# 上传图片允许的大小（单位：MB）
+# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
 images.upload.maxSize=5
 
-################## 定时脚本配置 #########################
-# 定时发送消息
+################## \u5B9A\u65F6\u811A\u672C\u914D\u7F6E #########################
+# \u5B9A\u65F6\u53D1\u9001\u6D88\u606F
 message.job.switch = 1
 message.job.time = 0 0/1 * * * ?
 
-# 卡券到期处理
+# \u5361\u5238\u5230\u671F\u5904\u7406
 couponExpire.job.switch = 1
 couponExpire.job.time = 0 0/1 * * * ?
 
-# 订单超时取消
+# \u8BA2\u5355\u8D85\u65F6\u53D6\u6D88
 orderCancel.job.switch = 1
 orderCancel.job.time = 0 0/1 * * * ?
 
-################## 阿里云短信配置 #######################
-# 短信接口模式[0-关闭 1-打开]
+################## \u963F\u91CC\u4E91\u77ED\u4FE1\u914D\u7F6E #######################
+# \u77ED\u4FE1\u63A5\u53E3\u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
 aliyun.sms.mode = 0
 aliyun.sms.accessKeyId=LTAI4GJMjV123oXsrQJLnPZt
 aliyun.sms.accessKeySecret=eGVBL30u5Ypj234d7XODlwYKWTaGT
-# 阿里云短信签名
-aliyun.sms.signName=延禾技术
+# \u963F\u91CC\u4E91\u77ED\u4FE1\u7B7E\u540D
+aliyun.sms.signName=\u5EF6\u79BE\u6280\u672F
 
-################## 阿里云OSS存储配置######################
-# 模式[0-关闭 1-打开]
+################## \u963F\u91CC\u4E91OSS\u5B58\u50A8\u914D\u7F6E######################
+# \u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
 aliyun.oss.mode = 0
-aliyun.oss.accessKeyId = LTAI4GJMjVhBa212rQJLnPZt
+aliyun.oss.accessKeyId = LTAI4GJMjVhBa212rQJLnPZtt
 aliyun.oss.accessKeySecret = eGVBL30u53456gXd7XODlwYKWTaGT
 aliyun.oss.endpoint = https://oss-cn-shenzhen.aliyuncs.com
 aliyun.oss.bucketName = fuint-application
-# 上传文件夹
+# \u4E0A\u4F20\u6587\u4EF6\u5939
 aliyun.oss.folder = uploads
-# 访问域名
+# \u8BBF\u95EE\u57DF\u540D
 aliyun.oss.domain = https://fuint-application.oss-cn-shenzhen.aliyuncs.com
 
-################## 微信相关配置 ##########################
-# 公众号配置
+################## \u5FAE\u4FE1\u76F8\u5173\u914D\u7F6E ##########################
+# \u516C\u4F17\u53F7\u914D\u7F6E
 weixin.official.appId=wxf4327ef05c27a0
 weixin.official.appSecret=1f55e8749332234d9a074873d8e6a3
 
-# 小程序配置
-wxpay.appId = wxb6af3741234162bc
-wxpay.appSecret = 76a538bfa5b55a4564d5f2be5540
+# \u5C0F\u7A0B\u5E8F\u914D\u7F6E
+#wxpay.appId = wxba517a9bac38fe92
+#wxpay.appSecret = 8bfcce86abc4e2a461ecc781a09249a5
+# \u8D22\u5229\u5B9D
+#wxpay.appId = wx033c30e366eff6ac
+#wxpay.appSecret = e46a9a5947380fb70a1aa33a5b427ba4
+#alipay.appid = 2021004128651378
+# \u6765\u4E2A\u6CB9\u6167
+wxpay.appId = wxd8014eaf9bd72e93
+wxpay.appSecret = 0194125b13cece10d5f6cdd664847b55
+alipay.appid = 2021004130635045
+
 wxpay.mchId=1636980812
 wxpay.apiV2=34354320201030y323e432342343
 wxpay.certPath=/usr/local/fuint/cert/apiclient_cert.p12
 wxpay.domain=https://www.fuint.cn/fuint-application
 
-################## 支付宝支付相关配置 ######################
-alipay.appId = 应用编号
-alipay.privateKey = 应用私钥
-alipay.publicKey = 支付宝公钥（通过应用公钥上传到支付宝开放平台换取支付宝公钥）
+################## \u652F\u4ED8\u5B9D\u652F\u4ED8\u76F8\u5173\u914D\u7F6E ######################
+alipay.appId = \u5E94\u7528\u7F16\u53F7
+alipay.privateKey = \u5E94\u7528\u79C1\u94A5
+alipay.publicKey = \u652F\u4ED8\u5B9D\u516C\u94A5\uFF08\u901A\u8FC7\u5E94\u7528\u516C\u94A5\u4E0A\u4F20\u5230\u652F\u4ED8\u5B9D\u5F00\u653E\u5E73\u53F0\u6362\u53D6\u652F\u4ED8\u5B9D\u516C\u94A5\uFF09
 alipay.serverUrl=https://openapi.alipay.com/gateway.do
 alipay.domain=https://www.fuint.cn/fuint-application/clientApi/pay/aliPayCallback
 
-################ 微信订阅模板消息配置 ######################
-weixin.subMessage.orderCreated=[{'key':'time', 'name':'订单时间'},{'key':'orderSn', 'name':'订单号'},{'key':'remark', 'name':'备注信息'}]
-weixin.subMessage.deliverGoods=[{'key':'receiver', 'name':'收货人'}, {'key':'orderSn', 'name':'订单号'}, {'key':'expressCompany', 'name':'快递公司'}, {'key':'expressNo', 'name':'快递单号'}]
-weixin.subMessage.couponExpire=[{'key':'name', 'name':'卡券名称'}, {'key':'expireTime', 'name':'到期时间'},{'key':'tips', 'name':'温馨提示'}]
-weixin.subMessage.couponArrival=[{'key':'name', 'name':'卡券名称'},{'key':'amount', 'name':'金额'},{'key':'tips', 'name':'温馨提示'}]
-weixin.subMessage.balanceChange=[{'key':'amount', 'name':'变动金额'},{'key':'time', 'name':'变动时间'},{'key':'tips', 'name':'温馨提示'}]
-weixin.subMessage.couponConfirm=[{'key':'name', 'name':'卡券名称'},{'key':'time', 'name':'核销时间'}]
-weixin.subMessage.pointChange=[{'key':'amount', 'name':'变动数量'},{'key':'time', 'name':'变动时间'},{'key':'remark', 'name':'备注信息'}]
\ No newline at end of file
+################ \u5FAE\u4FE1\u8BA2\u9605\u6A21\u677F\u6D88\u606F\u914D\u7F6E ######################
+weixin.subMessage.orderCreated=[{'key':'time', 'name':'\u8BA2\u5355\u65F6\u95F4'},{'key':'orderSn', 'name':'\u8BA2\u5355\u53F7'},{'key':'remark', 'name':'\u5907\u6CE8\u4FE1\u606F'}]
+weixin.subMessage.deliverGoods=[{'key':'receiver', 'name':'\u6536\u8D27\u4EBA'}, {'key':'orderSn', 'name':'\u8BA2\u5355\u53F7'}, {'key':'expressCompany', 'name':'\u5FEB\u9012\u516C\u53F8'}, {'key':'expressNo', 'name':'\u5FEB\u9012\u5355\u53F7'}]
+weixin.subMessage.couponExpire=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'}, {'key':'expireTime', 'name':'\u5230\u671F\u65F6\u95F4'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.couponArrival=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'},{'key':'amount', 'name':'\u91D1\u989D'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.balanceChange=[{'key':'amount', 'name':'\u53D8\u52A8\u91D1\u989D'},{'key':'time', 'name':'\u53D8\u52A8\u65F6\u95F4'},{'key':'tips', 'name':'\u6E29\u99A8\u63D0\u793A'}]
+weixin.subMessage.couponConfirm=[{'key':'name', 'name':'\u5361\u5238\u540D\u79F0'},{'key':'time', 'name':'\u6838\u9500\u65F6\u95F4'}]
+weixin.subMessage.pointChange=[{'key':'amount', 'name':'\u53D8\u52A8\u6570\u91CF'},{'key':'time', 'name':'\u53D8\u52A8\u65F6\u95F4'},{'key':'remark', 'name':'\u5907\u6CE8\u4FE1\u606F'}]
+
+# rocketmq\u914D\u7F6E
+//1
+rocketmq.name-server=127.0.0.1:9876
+//2
+rocketmq.producer.group=provider
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 2062aa8df..b5abbc841 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
@@ -122,6 +122,8 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         Integer storeId = nowAccountInfo.getStoreId();
         if (ObjectUtil.isEmpty(merchantConfig.getStoreId())) {
             storeId = nowAccountInfo.getStoreId();
+//        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+//        if (ObjectUtil.isEmpty(merchantConfig.getStoreId())) {
             merchantConfig.setStoreId(nowAccountInfo.getStoreId());
         }
         int row = 0;
@@ -134,7 +136,7 @@ public class MerchantConfigServiceImpl extends ServiceImpl<MerchantConfigMapper,
         }
         merchantConfig.setAppid(FuYouPublicMerchant.appid);
         merchantConfig.setAlipayAppid(FuYouPublicMerchant.alipayAppid);
-        MerchantConfig merchantConfig1 = this.selectMeChByIdIsUse(storeId);
+        MerchantConfig merchantConfig1 = this.selectMeChByIdIsUse(nowAccountInfo.getStoreId());
         if (ObjectUtil.isEmpty(merchantConfig1)){
             merchantConfig.setIsUse("1");
         }else {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
index 7b5937168..f89ce22a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/controller/IndexBannerController.java
@@ -56,7 +56,7 @@ public class IndexBannerController extends BaseController {
      */
     @PostMapping
     public ResponseObject add(@RequestBody IndexBanner indexBanner){
-        return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner));
+        return getSuccessResult(indexBannerService.insertIndexBanner(indexBanner,null));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
index e792af390..6d99841c8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/IndexBannerService.java
@@ -40,7 +40,7 @@ public interface IndexBannerService {
      * @param indexBanner
      * @return
      */
-    int insertIndexBanner(IndexBanner indexBanner);
+    int insertIndexBanner(IndexBanner indexBanner,Integer storeId);
 
     /**
      * 修改首页banner图
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
index 070a35cdf..fd2f6992b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/indexBanner/service/impl/IndexBannerServiceImpl.java
@@ -43,16 +43,22 @@ public class IndexBannerServiceImpl extends ServiceImpl<IndexBannerMapper, Index
     }
 
     @Override
-    public int insertIndexBanner(IndexBanner indexBanner) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        indexBanner.setStoreId(nowAccountInfo.getStoreId());
+    public int insertIndexBanner(IndexBanner indexBanner,Integer storeId) {
+        if (storeId!=null){
+            indexBanner.setStoreId(storeId);
+        }else {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            indexBanner.setStoreId(nowAccountInfo.getStoreId());
+            storeId = nowAccountInfo.getStoreId();
+        }
+
         int row = 0;
         if (StringUtils.isEmpty(indexBanner.getRouteUrl())){
             indexBanner.setBannerUrl("http://47.95.206.185:83/topbj.png");
             indexBanner.setRouteUrl("/pagesHome/Activity/index");
             row = baseMapper.insert(indexBanner);
         }else {
-            IndexBanner indexBanner1 = this.selectIndexBannerByRouteUrl(indexBanner.getRouteUrl(),nowAccountInfo.getStoreId());
+            IndexBanner indexBanner1 = this.selectIndexBannerByRouteUrl(indexBanner.getRouteUrl(),storeId);
             if (ObjectUtil.isNotEmpty(indexBanner1)){
                 row = 0;
             }else {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
index b4e7f82ea..8da3e2345 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.member.entity.LJStaff;
+import com.fuint.repository.model.TAccount;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.FileNotFoundException;
@@ -60,6 +61,8 @@ public interface ILJStaffService extends IService<LJStaff> {
      */
     public int insertStaff(LJStaff staff);
 
+    int addStaff(LJStaff staff, TAccount tAccount);
+
     /**
      * 修改员工信息
      * @param staff
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 7ff4952f7..cd8947dfb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -119,7 +119,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
     @Override
     public void deleteStaffById(Integer id) {
         LJStaff staff = this.selectStaffById(id);
-        accountService.deleteAccountByUserName(staff.getMobile());
+        accountService.deleteAccountByUserName(staff.getId());
         baseMapper.deleteById(id);
     }
 
@@ -141,9 +141,12 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         }
         int row = baseMapper.insert(staff);
         LJStaff staff1 = this.selectStaffByMobile(staff.getMobile());
-//        添加员工码
-        staff1.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff1.getId());
-        this.updateStaff(staff1);
+        if (ObjectUtil.isNotEmpty(staff1)){
+            //        添加员工码
+            staff1.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff1.getId());
+            this.updateStaff(staff1);
+        }
+
 
 //        添加账户信息
         TAccount account = new TAccount();
@@ -159,17 +162,33 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         account.setCreateTime(new Date());
         account.setUpdateTime(new Date());
         account.setStoreId(storeId);
-        account.setPassword(staff.getPassword());
+
         if (StringUtils.isNotEmpty(staff.getRefundPassword())){
             account.setPassword(staff.getPassword());
         }else {
             account.setPassword("123456");
         }
+        if (StringUtils.isNotEmpty(staff.getPassword())){
+            account.setPassword(staff.getPassword());
+        }else {
+            account.setPassword("123456");
+        }
 
         accountService.createAccountInfo(account,null);
         return row;
     }
 
+    @Override
+    public int addStaff(LJStaff staff,TAccount tAccount) {
+        int row = baseMapper.insert(staff);
+        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile());
+        if (ObjectUtil.isNotEmpty(staff1)){
+            tAccount.setStaffId(staff1.getId());
+            accountService.updateAccount(tAccount);
+        }
+        return row;
+    }
+
     /**
      * 修改用户信息
      * @param staff
@@ -177,9 +196,19 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
      */
     @Override
     public int updateStaff(LJStaff staff) {
-        int row = baseMapper.updateById(staff);
+        int row = 0;
+        LJStaff staff1 = this.selectStaffByMobile(staff.getMobile());
+        if (ObjectUtil.isNotEmpty(staff1) && staff1.getId() != staff.getId()){
+            row = 0;
+            return row;
+        }
+        if (StringUtils.isEmpty(staff.getStaffCode())){
+            //        添加员工码
+            staff.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+staff.getStoreId()+"&staffId="+staff.getId());
+        }
+        row = baseMapper.updateById(staff);
         if (StringUtils.isNotEmpty(staff.getPassword())){
-            TAccount tAccount = accountService.selectAccountByUserName(staff.getMobile());
+            TAccount tAccount = accountService.selectAccountByStaffId(staff.getId());
             tAccount.setPassword(staff.getPassword());
             accountService.entryptPassword(tAccount);
             try {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
index 64abe8c38..0dad4dd6f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/QRCodeController.java
@@ -59,7 +59,7 @@ public class QRCodeController extends BaseController {
     @GetMapping("/add")
     public ResponseObject addQrCode(){
         QRCode qrCode = new QRCode();
-        return getSuccessResult(iqrCodeService.insertQRCode(qrCode));
+        return getSuccessResult(iqrCodeService.insertQRCode(qrCode,null));
     }
 
     /**
@@ -79,7 +79,7 @@ public class QRCodeController extends BaseController {
      */
     @PostMapping
     public ResponseObject add(@Validated @RequestBody QRCode qrCode){
-        return getSuccessResult(iqrCodeService.insertQRCode(qrCode));
+        return getSuccessResult(iqrCodeService.insertQRCode(qrCode,null));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java
index b38cf9b2a..f99509481 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java
@@ -44,6 +44,13 @@ public interface ILJStoreService extends IService<LJStore> {
      */
     public List<Map<String,Object>> queryStoreByPosition(Map<String,String> map);
 
+    /**
+     * 根据部门id查询店铺信息
+     * @param deptId
+     * @return
+     */
+    public LJStore selectStoreByDeptId(Long deptId);
+
     /**
      * 查询店铺信息
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
index 8f5fd7ff8..46d9c247e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/IQRCodeService.java
@@ -26,6 +26,12 @@ public interface IQRCodeService  extends IService<QRCode> {
      */
     public QRCode selectQRCode();
 
+    /**
+     * 根据店铺id查询二维码信息
+     * @return
+     */
+    public QRCode selectQRCodeByStoreId(int storeId);
+
     /**
      * 根据id查询二维码信息
      * @param id
@@ -44,7 +50,7 @@ public interface IQRCodeService  extends IService<QRCode> {
      * @param qrCode
      * @return
      */
-    public int insertQRCode(QRCode qrCode);
+    public int insertQRCode(QRCode qrCode,Integer storeId);
 
     /**
      * 修改二维码信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
index 09efe1eb6..2272a078c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
@@ -166,6 +166,13 @@ public class LJStoreServiceImpl extends ServiceImpl<LJStoreMapper, LJStore> impl
         return list1;
     }
 
+    @Override
+    public LJStore selectStoreByDeptId(Long deptId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("contract_dept_id",deptId);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
     /**
      * 查询店铺信息
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
index 9f49151ac..2c9e0e669 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/QRCodeServiceImpl.java
@@ -45,6 +45,13 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
         return baseMapper.selectOne(queryWrapper);
     }
 
+    @Override
+    public QRCode selectQRCodeByStoreId(int storeId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",storeId);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
     /**
      * 根据id查询二维码信息
      * @param id
@@ -75,11 +82,14 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
      * @return
      */
     @Override
-    public int insertQRCode(QRCode qrCode) {
+    public int insertQRCode(QRCode qrCode,Integer storeId) {
+        if (storeId==null){
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            storeId = nowAccountInfo.getStoreId();
+        }
 //        查询是否存在当前门店二维码信息
-        QRCode qrCode1 = this.selectQRCode();
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
+        QRCode qrCode1 = this.selectQRCodeByStoreId(storeId);
+        LJStore store = storeService.selectStoreByStoreId(storeId);
         int row = 0;
         if (ObjectUtil.isEmpty(qrCode1)){
             qrCode.setStoreId(store.getId());
@@ -90,7 +100,7 @@ public class QRCodeServiceImpl extends ServiceImpl<QRCodeMapper, QRCode> impleme
             qrCode.setPayment("https://www.tuofeng.cc/oilRefuel?storeId="+store.getChainStoreId());
             row = baseMapper.insert(qrCode);
             IndexBanner indexBanner = new IndexBanner();
-            indexBannerService.insertIndexBanner(indexBanner);
+            indexBannerService.insertIndexBanner(indexBanner,storeId);
         }else {
             row = 0;
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
index f3f2f3564..a3fdcc02e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserGradeController.java
@@ -121,7 +121,7 @@ public class LJUserGradeController extends BaseController {
      */
     @PostMapping
     public ResponseObject add(@Validated @RequestBody LJUserGrade userGrade){
-        return getSuccessResult(userGradeService.insertUserGrade(userGrade));
+        return getSuccessResult(userGradeService.insertUserGrade(userGrade,null));
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
index 8e5c08285..0bfbcc960 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserGradeService.java
@@ -86,7 +86,7 @@ public interface LJUserGradeService extends IService<LJUserGrade> {
      * @param userGrade
      * @return
      */
-    public int insertUserGrade(LJUserGrade userGrade);
+    public int insertUserGrade(LJUserGrade userGrade,Integer storeId);
 
     /**
      * 修改会员等级信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
index b24b6d8c1..89775c754 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
@@ -158,9 +158,12 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
     }
 
     @Override
-    public int insertUserGrade(LJUserGrade userGrade) {
-        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
-        Integer storeId = nowAccountInfo.getStoreId();
+    public int insertUserGrade(LJUserGrade userGrade,Integer storeId) {
+        if (storeId == null){
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            storeId = nowAccountInfo.getStoreId();
+        }
+
         int row = 0;
 //        根据等级级别查询等级信息是否存在
         QueryWrapper queryWrapper1 = new QueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index dba8449e9..3c15dfbad 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -226,10 +226,10 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();
         LJUser user1 = new LJUser();
-        if (user.getMobile()==null || user.getMobile().equals("")){
+        if (StringUtils.isEmpty(user.getMobile())){
             return 0;
         }
-        if (user.getUserNo()==null || user.getUserNo().equals("")){
+        if (StringUtils.isEmpty(user.getUserNo())){
             Random random = new Random();
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < 7; i++) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
index a26173a28..3b9e6508e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/AccountService.java
@@ -59,13 +59,20 @@ public interface AccountService extends IService<TAccount> {
      * @param accountName
      * @return
      */
-    TAccount selectAccountByUserName(String accountName);
+    TAccount selectAccountByName(String accountName);
+
+    /**
+     * 根据员工id查询员工账户信息
+     * @param staffId
+     * @return
+     */
+    TAccount selectAccountByStaffId(Integer staffId);
 
     /**
      * 根据用户名删除账户信息
-     * @param accountName
+     * @param staffId
      */
-    void deleteAccountByUserName(String accountName);
+    void deleteAccountByUserName(Integer staffId);
 
     /**
      * 获取账号角色ID
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index 99fc8659b..a4aab5f5c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -229,15 +229,22 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
     }
 
     @Override
-    public TAccount selectAccountByUserName(String accountName) {
+    public TAccount selectAccountByName(String accountName) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("account_name",accountName);
         return baseMapper.selectOne(queryWrapper);
     }
 
     @Override
-    public void deleteAccountByUserName(String accountName) {
-        TAccount tAccount = this.selectAccountByUserName(accountName);
+    public TAccount selectAccountByStaffId(Integer staffId) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("staff_id",staffId);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    @Override
+    public void deleteAccountByUserName(Integer staffId) {
+        TAccount tAccount = this.selectAccountByStaffId(staffId);
         if (ObjectUtil.isNotEmpty(tAccount)){
             baseMapper.deleteById(tAccount.getAcctId());
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
index e08814880..dda15c850 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
@@ -1,8 +1,13 @@
 package com.fuint.system.dept.controller;
 
 
+import cn.hutool.core.util.ObjectUtil;
+import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.entity.QRCode;
+import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.storeInformation.service.IQRCodeService;
+import com.fuint.business.userManager.entity.LJUserGrade;
+import com.fuint.business.userManager.service.LJUserGradeService;
 import com.fuint.common.constant.UserConstants;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.StringUtils;
@@ -63,6 +68,10 @@ public class SysDeptController extends BaseController
 
     @Autowired
     private IQRCodeService iqrCodeService;
+    @Autowired
+    private ILJStoreService storeService;
+    @Autowired
+    private LJUserGradeService userGradeService;
 
     /**
      * 新增部门
@@ -73,9 +82,25 @@ public class SysDeptController extends BaseController
         {
             return getFailureResult("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        QRCode qrCode = new QRCode();
-        iqrCodeService.insertQRCode(qrCode);
-        return getSuccessResult(deptService.insertDept(dept));
+        int row = deptService.insertDept(dept);
+        SysDept sysDept = deptService.selectSysDeptByName(dept.getDeptName());
+        if (ObjectUtil.isNotEmpty(sysDept)){
+            LJStore store = storeService.selectStoreByDeptId(sysDept.getDeptId());
+            QRCode qrCode = new QRCode();
+            iqrCodeService.insertQRCode(qrCode,store.getId());
+            LJUserGrade userGrade = new LJUserGrade();
+            userGrade.setStoreId(store.getId());
+            userGrade.setGrade(1);
+            userGrade.setName("普通会员");
+            userGrade.setStatus("qy");
+            userGrade.setGrowthValue(1);
+            userGrade.setPreferential("自定义优惠");
+            userGrade.setGasolineDiscount("无优惠");
+            userGrade.setDieselDiscount("无优惠");
+            userGrade.setNaturalGasDiscount("无优惠");
+            userGradeService.insertUserGrade(userGrade,store.getId());
+        }
+        return getSuccessResult(row);
     }
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
index 0243004a9..95e3b89fa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/ISysDeptService.java
@@ -87,6 +87,12 @@ public interface ISysDeptService extends IService<SysDept>
      */
     public boolean checkDeptNameUnique(SysDept dept);
 
+    /**
+     * 根据机构名称查询机构信息
+     * @param deptName
+     * @return
+     */
+    SysDept selectSysDeptByName(String deptName);
 
     /**
      * 新增保存部门信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
index f4c4c678b..d681e8615 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/service/impl/SysDeptServiceImpl.java
@@ -3,6 +3,7 @@ package com.fuint.system.dept.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.aliyun.oss.ServiceException;
 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.business.store.entity.ChainStoreInfo;
 import com.fuint.business.store.entity.MtStore;
@@ -183,6 +184,13 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper,SysDept> imple
         return UserConstants.UNIQUE;
     }
 
+    @Override
+    public SysDept selectSysDeptByName(String deptName) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("dept_name",deptName);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
 
     /**
      * 新增保存部门信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
index 19b55a2c9..a16693c1d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/user/controller/BackendAccountController.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.member.entity.LJStaff;
+import com.fuint.business.member.service.ILJStaffService;
 import com.fuint.business.store.mapper.MtStoreMapper;
 import com.fuint.common.dto.AccountDto;
 import com.fuint.common.dto.AccountInfo;
@@ -30,6 +32,7 @@ import com.thoughtworks.xstream.mapper.LambdaMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -178,6 +181,9 @@ public class BackendAccountController extends BaseController {
 
     @Resource
     TAccountDutyMapper tAccountDutyMapper;
+    @Autowired
+    @Lazy
+    private ILJStaffService staffService;
 
     @Resource
     MtStoreMapper mtStoreMapper;
@@ -278,7 +284,14 @@ public class BackendAccountController extends BaseController {
 
         tAccountService.createAccountInfo(tAccount, duties);
 
-
+        TAccount tAccount1 = tAccountService.selectAccountByName(accountName);
+        LJStaff staff = new LJStaff();
+        staff.setStoreId(mtStore.getId());
+        staff.setRealName(realName);
+        staff.setStatus("qy");
+        staff.setRoleId(roleId);
+        staff.setMobile(param.get("mobile").toString());
+        staffService.addStaff(staff,tAccount1);
 
         return getSuccessResult(true);
     }
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index ea3374b24..228939d20 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 # \u57FA\u672C\u914D\u7F6E
 server.port=8008
 env.profile=dev
-#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
-env.properties.path=D:/code/oilSystem/fuintBackend/configure/
-
+env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
+#env.properties.path=D:/code/oilSystem/fuintBackend/configure/
+#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/configure/
 
 
 # \u6570\u636E\u5E93\u914D\u7F6E
diff --git a/fuintBackend/fuint-payment/src/main/java/com/fuint/paymentApplication.java b/fuintBackend/fuint-payment/src/main/java/com/fuint/paymentApplication.java
new file mode 100644
index 000000000..ed655d083
--- /dev/null
+++ b/fuintBackend/fuint-payment/src/main/java/com/fuint/paymentApplication.java
@@ -0,0 +1,7 @@
+package com.fuint;
+
+public class paymentApplication {
+    public static void main(String[] args) {
+
+    }
+}
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
index d4d41fea7..4ed51de4a 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
@@ -73,4 +73,6 @@ public class TAccount extends BaseEntity implements Serializable {
     private Long deptId;
     @TableField(exist = false)
     private String deptName;
+    @TableField(exist = false)
+    private String mobile;
 }
diff --git a/fuintCashierWeb/.env.development b/fuintCashierWeb/.env.development
index 30cb55dba20c9b496e75cbbb6370a3705d2e5ac9..65f43be4b73d4304ffec3d03f0c3696e2c501b2d 100644
GIT binary patch
delta 32
dcmZ3$w2)~7C!>Usp_PS!g@L|07Xvcj0svw?1MdI;

delta 31
ccmZ3;w18;?C!@Hzg_VVYfrUC312W(O09=Rz%K!iX

diff --git a/fuintCashierWeb/.env.production b/fuintCashierWeb/.env.production
index e06b14839..b3b415649 100644
--- a/fuintCashierWeb/.env.production
+++ b/fuintCashierWeb/.env.production
@@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
 VUE_APP_PUBLIC_PATH = '/fuintCashier/'
 
 # 后端接口地址
-VUE_APP_SERVER_URL = 'https://www.fuint.cn/fuint-application/'
+VUE_APP_SERVER_URL = 'https://www.tuofeng.cc/oilAdmin/'
diff --git a/gasStation-uni/package-lock.json b/gasStation-uni/package-lock.json
index 8b04f6519..062c80a42 100644
--- a/gasStation-uni/package-lock.json
+++ b/gasStation-uni/package-lock.json
@@ -1,4 +1,6 @@
 {
+  "name": "gasStation-uni",
+  "lockfileVersion": 2,
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {
@@ -7,12 +9,296 @@
       "resolved": "https://registry.npmjs.org/@dcloudio/uni-ui/-/uni-ui-1.4.28.tgz",
       "integrity": "sha512-e/lSbvR79KH9+d3D4ueNbvD6szigjO/5IyjBNmiTqaj0PTS324fBV3L6f3s1qpkYonM4rdOl000hVOcAg6Gh/A=="
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+      "dev": true,
+      "peer": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "peer": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
+      "dev": true,
+      "peer": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.20",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
+      "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "@types/eslint": {
+      "version": "8.56.1",
+      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.56.1.tgz",
+      "integrity": "sha512-18PLWRzhy9glDQp3+wOgfLYRWlhgX0azxgJ63rdpoUHyrC9z0f5CkFburjQx4uD7ZCruw85ZtMt6K+L+R8fLJQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/eslint-scope": {
+      "version": "3.7.7",
+      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
+    "@types/estree": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "dev": true,
+      "peer": true
+    },
     "@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true
     },
+    "@types/node": {
+      "version": "20.10.6",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.10.6.tgz",
+      "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+      }
+    },
+    "@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
+      }
+    },
+    "@webassemblyjs/ieee754": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/ieee754": "^1.2.0"
+      }
+    },
+    "@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@webassemblyjs/utf8": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "dev": true,
+      "peer": true
+    },
+    "@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
+      }
+    },
+    "@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
+      }
+    },
+    "@xtuc/ieee754": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "dev": true,
+      "peer": true
+    },
+    "@xtuc/long": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "dev": true,
+      "peer": true
+    },
+    "acorn": {
+      "version": "8.11.3",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz",
+      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "dev": true,
+      "peer": true
+    },
+    "acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "peer": true,
+      "requires": {}
+    },
     "ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -29,7 +315,8 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "anymatch": {
       "version": "3.1.3",
@@ -67,6 +354,33 @@
         "fill-range": "^7.0.1"
       }
     },
+    "browserslist": {
+      "version": "4.22.2",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.2.tgz",
+      "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "caniuse-lite": "^1.0.30001565",
+        "electron-to-chromium": "^1.4.601",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "peer": true
+    },
+    "caniuse-lite": {
+      "version": "1.0.30001574",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz",
+      "integrity": "sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg==",
+      "dev": true,
+      "peer": true
+    },
     "chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
@@ -83,17 +397,107 @@
         "readdirp": "~3.6.0"
       }
     },
+    "chrome-trace-event": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true,
+      "peer": true
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true,
+      "peer": true
+    },
     "crypto-js": {
       "version": "4.2.0",
       "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
       "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
     },
+    "electron-to-chromium": {
+      "version": "1.4.620",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.620.tgz",
+      "integrity": "sha512-a2fcSHOHrqBJsPNXtf6ZCEZpXrFCcbK1FBxfX3txoqWzNgtEDG1f3M59M98iwxhRW4iMKESnSjbJ310/rkrp0g==",
+      "dev": true,
+      "peer": true
+    },
     "emojis-list": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
       "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
+    "enhanced-resolve": {
+      "version": "5.15.0",
+      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      }
+    },
+    "es-module-lexer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==",
+      "dev": true,
+      "peer": true
+    },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
+      "peer": true
+    },
+    "eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true,
+          "peer": true
+        }
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true,
+      "peer": true
+    },
+    "events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "dev": true,
+      "peer": true
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -131,6 +535,27 @@
         "is-glob": "^4.0.1"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true,
+      "peer": true
+    },
+    "graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true,
+      "peer": true
+    },
+    "has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "peer": true
+    },
     "immutable": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
@@ -167,6 +592,25 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      }
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "peer": true
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -185,6 +629,13 @@
       "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
       "dev": true
     },
+    "loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true,
+      "peer": true
+    },
     "loader-utils": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
@@ -205,18 +656,56 @@
         "yallist": "^4.0.0"
       }
     },
+    "merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true,
+      "peer": true
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "dev": true,
+      "peer": true
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
     "neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
+    "node-releases": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.14.tgz",
+      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
+      "dev": true,
+      "peer": true
+    },
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true,
+      "peer": true
+    },
     "picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -229,6 +718,16 @@
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true
     },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
     "readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -238,6 +737,13 @@
         "picomatch": "^2.2.1"
       }
     },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "peer": true
+    },
     "sass": {
       "version": "1.69.5",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.69.5.tgz",
@@ -282,12 +788,84 @@
         "lru-cache": "^6.0.0"
       }
     },
+    "serialize-javascript": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "peer": true
+    },
     "source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
       "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "dev": true
     },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "tapable": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "dev": true,
+      "peer": true
+    },
+    "terser": {
+      "version": "5.26.0",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.26.0.tgz",
+      "integrity": "sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      }
+    },
+    "terser-webpack-plugin": {
+      "version": "5.3.10",
+      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
+      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@jridgewell/trace-mapping": "^0.3.20",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.26.0"
+      }
+    },
     "to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -297,6 +875,24 @@
         "is-number": "^7.0.0"
       }
     },
+    "undici-types": {
+      "version": "5.26.5",
+      "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
+      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+      "dev": true,
+      "peer": true
+    },
+    "update-browserslist-db": {
+      "version": "1.0.13",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "escalade": "^3.1.1",
+        "picocolors": "^1.0.0"
+      }
+    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -311,6 +907,57 @@
       "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.36.tgz",
       "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
     },
+    "watchpack": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
+      }
+    },
+    "webpack": {
+      "version": "5.89.0",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.89.0.tgz",
+      "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+      "dev": true,
+      "peer": true,
+      "requires": {
+        "@types/eslint-scope": "^3.7.3",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
+        "acorn": "^8.7.1",
+        "acorn-import-assertions": "^1.9.0",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.15.0",
+        "es-module-lexer": "^1.2.1",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-even-better-errors": "^2.3.1",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.2.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.3.7",
+        "watchpack": "^2.4.0",
+        "webpack-sources": "^3.2.3"
+      }
+    },
+    "webpack-sources": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "peer": true
+    },
     "weixin-js-sdk": {
       "version": "1.6.5",
       "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index c1b04e4b9..9a6bd5b07 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -181,7 +181,6 @@
 			}
 		},
 		onLoad(query) {
-
 			if (query.storeId) {
 				uni.setStorageSync("y_storeId", query.storeId)
 			}
@@ -194,22 +193,32 @@
 			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
 			if (query.q) {
 				let str = q.split("?")[1];
-				let arr = str.split("&");
-
 				let storeId = "19";
 
 				let staffId = "";
-				arr.forEach(item => {
-					if (item.includes("storeId")) {
-						storeId = item.split("=")[1]
-					} else {
-						staffId = item.split("=")[1]
-					}
-				})
+				if (str.includes("&")){
+					let arr = str.split("&");
+					arr.forEach(item => {
+						if (item.includes("storeId")) {
+							storeId = item.split("=")[1]
+						} else {
+							staffId = item.split("=")[1]
+						}
+					})
+				}else{
+					storeId = str.split("=")[1]
+				}
+
+				
 				uni.setStorageSync("storeId", storeId)
 				uni.setStorageSync("inviteStaffId", staffId)
 				this.storeId = uni.getStorageSync("storeId")
 				this.staffId = uni.getStorageSync("inviteStaffId")
+				uni.showLoading({
+					title:uni.getStorageSync("storeId") + "++" +uni.getStorageSync("inviteStaffId") + q
+				})
+				this.getUserAuthority();
+				this.getOilType();
 			} else {
 				if (uni.getStorageSync("storeId")) {
 					this.storeId = uni.getStorageSync("storeId")
@@ -302,7 +311,7 @@
 				})
 			},
 			isExistStoreId() {
-				if (uni.getStorageSync("storeId") != "") {
+				if (uni.getStorageSync("storeId")) {
 					this.getStore(uni.getStorageSync("storeId"));
 				} else {
 					this.getAddress();
@@ -331,6 +340,9 @@
 							// 用户同意获取位置信息
 							_this.isExistStoreId()
 						}
+					},
+					fail(err) {
+						
 					}
 				})
 			},
@@ -348,15 +360,14 @@
 					let welfare = response.data.welfare
 					uni.setStorageSync("storeId", response.data.id)
 					uni.setStorageSync("chainStoreId", response.data.chainStoreId)
-					if (welfare != undefined && welfare != null && welfare != "") {
+					if (welfare) {
 						if (welfare.includes(",")) {
 							_this.welfare = response.data.welfare.split(",")
 						} else {
 							_this.welfare.push(response.data.welfare)
 						}
 					}
-					if (response.data.doorstepPhoto != undefined && response.data
-						.doorstepPhoto != null && response.data.doorstepPhoto != "") {
+					if (response.data.doorstepPhoto) {
 						let list = JSON.parse(response.data.doorstepPhoto)
 						_this.list3 = [];
 						list.forEach(item => {
diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue
index 428c1a20c..efc67a2b0 100644
--- a/gasStation-uni/pages/refuel/refuel.vue
+++ b/gasStation-uni/pages/refuel/refuel.vue
@@ -170,24 +170,30 @@
 			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
 			if (query.q) {
 				let str = q.split("?")[1];
-				let arr = str.split("&");
-				let storeId = "";
+				let storeId = "19";
+				
 				let staffId = "";
-				arr.forEach(item => {
-					if (item.includes("storeId")) {
-						storeId = item.split("=")[1]
-					} else {
-						staffId = item.split("=")[1]
-					}
-				})
+				if (str.includes("&")){
+					let arr = str.split("&");
+					arr.forEach(item => {
+						if (item.includes("storeId")) {
+							storeId = item.split("=")[1]
+						} else {
+							staffId = item.split("=")[1]
+						}
+					})
+				}else{
+					storeId = str.split("=")[1]
+				}
+				
+				
 				uni.setStorageSync("storeId", storeId)
 				uni.setStorageSync("inviteStaffId", staffId)
 				this.storeId = uni.getStorageSync("storeId")
 				this.staffId = uni.getStorageSync("inviteStaffId")
-				uni.showLoading({
-					title:storeId +"++"+staffId
-				})
+				this.getStore(uni.getStorageSync("storeId"));
 			}
+			
 		},
 		onShow() {
 			// this.isExistStoreId();
@@ -204,6 +210,9 @@
 			},
 			// 获取门店信息
 			getStore(id){
+				uni.showToast({
+					title:333
+				})
 				let _this = this;
 				request({
 					url: "business/storeInformation/store/queryStoreById",
@@ -215,13 +224,17 @@
 					_this.store = res.data
 					_this.storeId = res.data.id;
 					let welfare = res.data.welfare
-					if (welfare != undefined && welfare != null && welfare != "") {
+					if (welfare) {
 						if (welfare.includes(",")) {
 							_this.welfare = res.data.welfare.split(",")
 						} else {
 							_this.welfare.push(res.data.welfare)
 						}
 					}
+				}).catch(err => {
+					uni.showLoading({
+						title:JSON.stringify(err)+222
+					})
 				})
 			},
 			// 获取当前位置