会员管理 固定等级

fuintAdmin/src/api/convenienceStore/goods.js

@@ -28,19 +28,27 @@ export function list(data) {
 }
 
 // 根据id查询一级分类
-export function selectParentById(query) {
+export function selectParentById(id) {
   return request({
-    url: '/business/cvsGoods',
+    url: '/business/cvsGoods/'+id,
     method: 'get',
-    params: query
   })
 }
+
+// 修改会员
+export function updateCevGood(data) {
+  return request({
+    url: '/business/cvsGoods',
+    method: 'put',
+    data: data
+  })
+}
+
 // 根据id查询一级分类
 export function deleteBYId(id) {
   return request({
-    url: '/business/cvsGoods/detele/'+id,
+    url: '/business/cvsGoods/'+id,
     method: 'delete',
-
   })
 }
 

fuintAdmin/src/views/convenienceStore/index.vue

@@ -1,346 +1,497 @@
 <template>
-    <div>
+  <div class="app-container">
-        <el-card style="margin-top: 20px;">
+    <el-card style="margin-top: 20px;">
-            <!-- 查询类别 -->
+        <!-- 查询类别 -->
-            <el-form :inline="true" :model="goodsQueryForm">
+      <el-form :inline="true" :model="queryParams">
-                <el-form-item label="分类名称" prop="categoryName">
+            <el-form-item label="分类名称" prop="categoryName">
-                    <el-input v-model="goodsQueryForm.categoryName" placeholder="请输入分类名称" clearable  @keyup.enter.native="onQuery"></el-input>
+                <el-input v-model="queryParams.categoryName" placeholder="请输入分类名称" clearable  @keyup.enter.native="handleQuery"></el-input>
-                </el-form-item>
+            </el-form-item>
-                <el-form-item label="状态">
+            <el-form-item label="状态">
-                    <el-select v-model="goodsQueryForm.status" placeholder="请选择商品状态" clearable >
+                <el-select v-model="queryParams.status" placeholder="请选择商品状态" clearable >
-                        <el-option
+                    <el-option
-                        v-for="dict in dict.type.zhzt"
+                    v-for="dict in dict.type.zhzt"
-                        :key="dict.value"
+                    :key="dict.value"
-                        :label="dict.label"
+                    :label="dict.label"
-                        :value="dict.value"/>
+                    :value="dict.value"/>
-                    </el-select>
+                </el-select>
-                </el-form-item>
+            </el-form-item>
-                <el-form-item>
+<!--            <el-form-item>-->
-                    <el-button type="primary" icon="el-icon-search" @click="onQuery">搜索</el-button>
+<!--                <el-button type="primary" icon="el-icon-search" @click="onQuery">搜索</el-button>-->
-                    <el-button @click="resetForm" icon="el-icon-refresh" >重置</el-button>
+<!--                <el-button @click="resetForm" icon="el-icon-refresh" >重置</el-button>-->
-                </el-form-item>
+<!--            </el-form-item>-->
-            </el-form>
+        <el-form-item>
-        </el-card>
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
 
-        <el-card style="margin-top: 15px;">
+    <el-card style="margin-top: 15px;">
-            <div class="tTop">分类列表
+      <el-button
-                <el-button  type="primary" @click="insertGoods" >添加分类</el-button>
+        type="primary"
-            </div>
+        icon="el-icon-plus"
-            <!-- default-expand-all二级菜单默认展开 -->
+        @click="handleAdd"
-            <!-- 分类列表 -->
+        v-hasPermi="['member:add']"
-            <el-table
+      >添加分类</el-button>
-                :data="tableData"
+<!--          <div class="tTop">分类列表-->
-                style="width: 100%;margin-bottom: 20px;"
+<!--              <el-button  type="primary" @click="insertGoods" >添加分类</el-button>-->
-                row-key="id"
+<!--          </div>-->
-                border
+      <!-- default-expand-all二级菜单默认展开 -->
-                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <!-- 分类列表 -->
-                <!-- <el-table-column
+      <el-table ref="tables" v-loading="loading" :data="list" row-key="id"
-                prop="id"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                label="序号"
+                @selection-change="handleSelectionChange" :default-sort="defaultSort"
-                width="180">
+                @sort-change="handleSortChange">
-                </el-table-column> -->
+        <el-table-column label="ID" prop="id" align="center" width="60"/>
-                <el-table-column prop="categoryName" label="分类名称" width="180" />
+        <el-table-column label="分类名称" align="center" prop="categoryName"/>
-                <el-table-column prop="sorted" label="排序"/>
+        <el-table-column label="商品编号" align="center" prop="code"/>
-                <el-table-column prop="status" label="状态" width="180">
+        <el-table-column label="排序" align="center" prop="sorted" />
-                    <template slot-scope="scope">
+        <el-table-column label="状态" align="center" prop="status">
-                        <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>
+          <template slot-scope="scope">
-                    </template>
+            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>
-                </el-table-column>
+          </template>
-                <el-table-column prop="createTime" label="创建时间" width="180" />
+        </el-table-column>
-                <el-table-column prop="createBy" label="创建人" width="180" />
+        <el-table-column label="创建时间" align="center" prop="createTime">
-                <el-table-column label="操作" width="180">
+          <template slot-scope="scope">
-                    <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
-                        <el-button type="primary" @click="editeCategory(scope.row)" size="mini">编辑</el-button>
+          </template>
-                        <el-button type="danger" @click="delCategory(scope.row.id)" size="mini">删除</el-button>
+        </el-table-column>
-                    </template>
+        <el-table-column label="创建人" align="center" prop="createBy">
-                </el-table-column>
+          <template slot-scope="scope">
-            </el-table>
+            <span>{{ getName(scope.row.createBy) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="120" fixed='right'>
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              v-hasPermi="['member:add']"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              v-hasPermi="['member:add']"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <!-- 添加类别对话框 -->
+      <pagination
-            <el-dialog title="添加分类"  :visible.sync="dialogFormVisible" width="500px">
+        v-show="total>0"
-                <el-form :model="form" :inline="true" :rules="rules" ref="form" >
+        :total="total"
-                    <el-form-item label="上级分类" >
+        :page.sync="queryParams.page"
-                        <el-select v-model="form.pid" placeholder="请选择上级分类">
+        :limit.sync="queryParams.pageSize"
-                        <el-option
+        @pagination="getList"
-                        v-for="item in goodsOptions"
+      />
-                        :label="item.categoryName"
-                        :value="item.id">
-                        </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="分类名称" prop="categoryName" style="margin-left: -8px;">
-                        <el-input v-model="form.categoryName" style="width: 300px;"></el-input>
-                    </el-form-item>
-                    <el-form-item label="排序规则">
-                        <el-input-number v-model="form.sorted" @change="handleChange" :min="0" :max="10" style="width: 300px;"></el-input-number>
-                    </el-form-item>
-                    <el-form-item >
-                        <el-radio-group v-model="form.status">
-                        <el-radio  v-for="dict in dict.type.zhzt"  :label="dict.value">{{ dict.label }}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                </el-form>
-                <div slot="footer" class="dialog-footer">
-                    <el-button @click="cancelSubmit">取 消</el-button>
-                    <el-button type="primary" @click="dooSubmit">确 定</el-button>
-                </div>
-            </el-dialog>
 
-            <!-- 修改类别对话框 -->
+<!--      <el-table-->
-            <el-dialog title="修改分类"  :visible.sync="editDialogFormVisible" width="500px">
+<!--          :data="list"-->
-                <el-form :model="editForm" :inline="true" :rules="rules" ref="editForm" >
+<!--          style="width: 100%;margin-bottom: 20px;"-->
-                    <el-form-item label="上级分类" v-if="isShow">
+<!--          row-key="id"-->
-                        <el-select v-model="editForm.pid" placeholder="请选择上级分类">
+<!--          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-                        <el-option
+<!--          &lt;!&ndash; <el-table-column-->
-                        v-for="item in goodsOptions"
+<!--          prop="id"-->
-                        :label="item.categoryName"
+<!--          label="序号"-->
-                        :value="item.id">
+<!--          width="180">-->
-                        </el-option>
+<!--          </el-table-column> &ndash;&gt;-->
-                        </el-select>
+<!--        <el-table-column label="ID" prop="id" align="center" width="60"/>-->
-                    </el-form-item>
+<!--          <el-table-column prop="categoryName" align="center" label="分类名称" width="180" />-->
-                    <el-form-item label="分类名称" prop="categoryName" style="margin-left: -8px;">
+<!--          <el-table-column prop="sorted" align="center" label="排序"/>-->
-                        <el-input v-model="editForm.categoryName" style="width: 300px;"></el-input>
+<!--          <el-table-column prop="status" align="center" label="状态" width="180">-->
-                    </el-form-item>
+<!--              <template slot-scope="scope">-->
-                    <el-form-item label="排序规则">
+<!--                  <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
-                        <el-input-number v-model="editForm.sorted" @change="handleChange" :min="0" :max="10" style="width: 300px;"></el-input-number>
+<!--              </template>-->
-                    </el-form-item>
+<!--          </el-table-column>-->
-                    <el-form-item >
+<!--          <el-table-column prop="createTime" align="center" label="创建时间" width="180" />-->
-                        <el-radio-group v-model="editForm.status">
+<!--          <el-table-column prop="createBy" align="center" label="创建人" width="180" />-->
-                        <el-radio   v-for="dict in dict.type.zhzt"  :label="dict.value">{{ dict.label }}</el-radio>
+<!--          <el-table-column label="操作" align="center" width="180">-->
-                        </el-radio-group>
+<!--              <template slot-scope="scope">-->
-                    </el-form-item>
+<!--                  <el-button type="primary" @click="editeCategory(scope.row)" size="mini">编辑</el-button>-->
-                </el-form>
+<!--                  <el-button type="danger" @click="delCategory(scope.row.id)" size="mini">删除</el-button>-->
-                <div slot="footer" class="dialog-footer">
+<!--              </template>-->
-                    <el-button @click="cancelEdite">取 消</el-button>
+<!--          </el-table-column>-->
-                    <el-button type="primary" @click="saveEdite">确 定</el-button>
+<!--      </el-table>-->
-                </div>
-            </el-dialog>
 
-            <div  class="pageSty">
+    </el-card>
-                <pagination
+      <!-- 添加类别对话框 -->
-                    v-show="total>0"
+      <el-dialog :title="title" :visible.sync="open" class="roll-dialog"
-                    :total="total"
+                 :close-on-click-modal="false" append-to-body width="500px">
-                    :page.sync="queryParams.pageNum"
+          <el-form :model="form" :inline="true" :rules="rules" ref="form" >
-                    :limit.sync="queryParams.pageSize"
+              <el-form-item label="上级分类" >
-                    @pagination="getList"/>
+                  <el-select v-model="form.pid" placeholder="请选择上级分类">
-            </div>
+                  <el-option
+                  v-for="item in goodsOptions"
+                  :label="item.categoryName"
+                  :value="item.id">
+                  </el-option>
+                  </el-select>
+              </el-form-item>
+              <el-form-item label="分类名称" prop="categoryName" style="margin-left: -8px;">
+                  <el-input v-model="form.categoryName" style="width: 300px;"></el-input>
+              </el-form-item>
+              <el-form-item label="排序规则">
+                  <el-input-number v-model="form.sorted" @change="handleChange" :min="0" :max="10" style="width: 300px;"></el-input-number>
+              </el-form-item>
+              <el-form-item >
+                  <el-radio-group v-model="form.status">
+                  <el-radio  v-for="dict in dict.type.zhzt"  :label="dict.value">{{ dict.label }}</el-radio>
+                  </el-radio-group>
+              </el-form-item>
+          </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
 
-        </el-card>
+      <!-- 修改类别对话框 -->
-    </div>
+<!--      <el-dialog title="修改分类"  :visible.sync="editDialogFormVisible" width="500px">-->
+<!--          <el-form :model="editForm" :inline="true" :rules="rules" ref="editForm" >-->
+<!--              <el-form-item label="上级分类" v-if="isShow">-->
+<!--                  <el-select v-model="editForm.pid" placeholder="请选择上级分类">-->
+<!--                  <el-option-->
+<!--                  v-for="item in goodsOptions"-->
+<!--                  :label="item.categoryName"-->
+<!--                  :value="item.id">-->
+<!--                  </el-option>-->
+<!--                  </el-select>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="分类名称" prop="categoryName" style="margin-left: -8px;">-->
+<!--                  <el-input v-model="editForm.categoryName" style="width: 300px;"></el-input>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item label="排序规则">-->
+<!--                  <el-input-number v-model="editForm.sorted" @change="handleChange" :min="0" :max="10" style="width: 300px;"></el-input-number>-->
+<!--              </el-form-item>-->
+<!--              <el-form-item >-->
+<!--                  <el-radio-group v-model="editForm.status">-->
+<!--                  <el-radio   v-for="dict in dict.type.zhzt"  :label="dict.value">{{ dict.label }}</el-radio>-->
+<!--                  </el-radio-group>-->
+<!--              </el-form-item>-->
+<!--          </el-form>-->
+<!--          <div slot="footer" class="dialog-footer">-->
+<!--              <el-button @click="cancelEdite">取 消</el-button>-->
+<!--              <el-button type="primary" @click="saveEdite">确 定</el-button>-->
+<!--          </div>-->
+<!--      </el-dialog>-->
+
+  </div>
 </template>
 
 <script>
-import { selectTree, list,insertCvsGoods,deleteBYId} from "@/api/convenienceStore/goods.js";
+import {
-import { runInThisContext } from "vm";
+  selectTree,
+  list,
+  insertCvsGoods,
+  deleteBYId,
+  selectParentById,
+  updateCevGood
+} from "@/api/convenienceStore/goods.js";
+import {delUser, getUser} from "@/api/staff/user/user";
+import {getAccount, getAccountList} from "@/api/system/account";
+import {addFixingLevel, updateFixingLevel} from "@/api/staff/user/fixinglevel";
 export default {
-    dicts:['zhzt'],
+  dicts:['zhzt'],
-    data() {
+  data() {
-        return {
+      return {
-            //是否修改一二级菜单
+        creatName:'',
-            isShow:false,
+        // 标题
-            //编辑表单
+        title: "",
-            editForm:{
+        // 是否显示弹出层
-                pid:'',
+        open: false,
-                categoryName:'',
+        // 遮罩层
-                status:'qy',
+        loading: true,
-                sorted:0,
+        // 总条数
-            },
+        total: 0,
-            //父级菜单列表
+        // 表格数据
-            goodsOptions:[],
+        list: [],
-            //查询表单
+        //是否修改一二级菜单
-            goodsQueryForm: {
+        isShow:false,
-                categoryName: '',
+        // 默认排序
-                status: '',
+        defaultSort: {prop: 'updateTime', order: 'descending'},
-                pid:"",
+        //编辑表单
-                pageNum:'1',
+        editForm:{
-                pageSize:'5'
+          pid:'',
-            },
+          categoryName:'',
-            // 添加对话框
+          status:'qy',
-            dialogFormVisible:false,
+          sorted:0,
-            //修改对话框
+        },
-            editDialogFormVisible:false,
+        //父级菜单列表
-            //对话框表单
+        goodsOptions:[],
-            form:{
+        //查询表单
-                pid:'',
+        goodsQueryForm: {
-                categoryName:'',
+          categoryName: '',
-                status:'qy',
+          status: '',
-                sorted:0,
+          pid:"",
-            },
+          pageNum:'1',
-            tableData: [{
+          pageSize:'5'
-                id: '',
+        },
-                pid:'',
+        // 添加对话框
-                categoryName: '',
+        dialogFormVisible:false,
-                sorted: '',
+        //修改对话框
-                status:'',
+        editDialogFormVisible:false,
-                createdTime:'',
+        //对话框表单
-                children: []
+        form:{
-            }],
+          pid:'',
-            // 总条数
+          categoryName:'',
-            total: 0,
+          status:'qy',
-            // 查询参数
+          sorted:0,
-            queryParams: {
+        },
-                pageNum: 1,
+        tableData: [{
-                pageSize: 5,
+          id: '',
-                categoryName:'',
+          pid:'',
-                status: undefined,
+          categoryName: '',
-            },
+          sorted: '',
-            aa:[],
+          status:'',
-            //校验规则
+          createdTime:'',
-            rules: {
+          children: []
-                categoryName: [
+        }],
-                    { required: true, message: '请输入分类名称', trigger: 'blur' },
+        // 查询参数
-                ],
+        queryParams: {
-            },
+          pageNum: 1,
+          pageSize: 5,
+          categoryName:'',
+          status: '',
+        },
+        aa:[],
+        //校验规则
+        rules: {
+          categoryName: [
+            { required: true, message: '请输入分类名称', trigger: 'blur' },
+          ],
+        },
 
 
-        };
+      };
+  },
+  created(){
+    this.getList();
+    this.getFirstMenu();
+  },
+  methods: {
+    // 表单重置
+    reset() {
+      this.form = {
+        pid:'',
+        categoryName:'',
+        status:'qy',
+        sorted:0,
+      }
     },
-    created(){
+    // 获取添加者姓名
+    getName(id){
+      getAccount(id).then(response=>{
+        this.creatName = response.data.account.realName
+      })
+      return this.creatName;
+    },
+    // 新增按钮操作
+    handleAdd() {
+      this.open = true;
+      this.title = "新增分类";
+    },
+    // 编辑类别
+    editeCategory(val){
+        // this.editForm .categoryName = ''
+        // this.editForm.pid = ''
+        // this.editForm.status = 'qy'
+        // this.editForm.sorted = 0
+        if(val.pid !== 0){
+            this.isShow = true
+        }
+        this.editDialogFormVisible = true
+        // selectParentById(val).then(response=>{
+        //     this.editForm.categoryName = response.data
+        //  })
+
+    },
+    // 取消编辑
+    cancelEdite(){
+        this.editDialogFormVisible = false
+    },
+    // 保存编辑
+    saveEdite(){
+        this.editDialogFormVisible = false
+    },
+    // 删除类别
+    delCategory(id){
+      deleteBYId(id).then(res=>{
+        // console.log(res)
+      })
+    },
+    //新增商品类别
+    insertGoods(){
+        this.resetForm('form')
+        this.form.categoryName = ''
+        this.form.pid = ''
+        this.form.status = 'qy'
+        this.form.sorted = 0
+        this.dialogFormVisible = true
+        this.getFirstMenu();
+    },
+    //获取父类
+    getFirstMenu(){
+        list(this.form).then(response=>{
+            this.goodsOptions = response.data
+        })
+    },
+    //查询商品类别
+    onQuery(){
+        selectTree(this.goodsQueryForm).then(response=>{
+            if (response.code === 200) {
+                if(response.data == null){
+                    this.tableData = []
+                    this.total = 0;
+                    this.$message('查询成功');
+                }else{
+                    this.tableData = response.data.records
+                    this.total = response.data.total;
+                    this.$message('查询成功');
+                }
+          } else {
+            this.$message('查询失败，请联系管理员');
+          }
+        })
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.queryParams.page = 1;
+      this.getList();
+    },
+    handleChange(){
+    },
+    //提交商品类别
+    dooSubmit(){
+        this.$refs['form'].validate(valid => {
+            if (valid) {
+                //新增一级分类
+                if(this.form.pid == '' || this.form.pid == undefined ){
+                    this.form.pid = 0
+                }
+                //新增二级
+                insertCvsGoods(this.form).then(response=>{
+                    if (response.code === 200) {
+                       this.rest()
+                        this.$message('新增成功');
+                    }else{
+                        this.$message('新增失败 请联系管理员');
+                    }
+
+                })
+
+
+            }
+        })
+    },
+    rest(){
+        this.dialogFormVisible = false
+        this.resetForm();
+        this.goodsOptions = []
+    },
+    // 取消提交
+    cancelSubmit(){
+        this.$refs.form.resetFields();//清空
+        this.form.categoryName = ''
+        this.form.pid = ''
+        this.form.status = ''
+        this.form.sorted = 0
+        this.dialogFormVisible = false
+    },
+    // 分页查询
+    getList(){
+      this.loading = true;
+      selectTree(this.queryParams).then(response => {
+        this.list = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消查询
+    resetForm(){
+        this.goodsQueryForm.categoryName = ''
+        this.goodsQueryForm.status = ''
         this.getList()
     },
-    methods: {
+    // 提交按钮
-        // 编辑类别
+    submitForm: function() {
-        editeCategory(val){
+      this.$refs["form"].validate(valid => {
-            // this.editForm .categoryName = ''
+        if (valid) {
-            // this.editForm.pid = ''
+          if (this.form.id) {
-            // this.editForm.status = 'qy'
+            updateCevGood(this.form).then(response => {
-            // this.editForm.sorted = 0
+              this.$modal.msgSuccess("分类更新成功");
-            if(val.pid !== 0){
+              this.open = false;
-                this.isShow = true
+              this.getList();
-            }
-            this.editDialogFormVisible = true
-            // selectParentById(val).then(response=>{
-            //     this.editForm.categoryName = response.data
-            //  })
-
-        },
-        // 取消编辑
-        cancelEdite(){
-            this.editDialogFormVisible = false
-        },
-        // 保存编辑
-        saveEdite(){
-            this.editDialogFormVisible = false
-        },
-        // 删除类别
-        delCategory(id){
-          deleteBYId(id).then(res=>{
-            console.log(res)
-          })
-        },
-        //新增商品类别
-        insertGoods(){
-            this.resetForm('form')
-            this.form.categoryName = ''
-            this.form.pid = ''
-            this.form.status = 'qy'
-            this.form.sorted = 0
-            this.dialogFormVisible = true
-            this.getFirstMenu();
-        },
-        //获取父类
-        getFirstMenu(){
-            list(this.form).then(response=>{
-                this.goodsOptions = response.data
-            })
-        },
-        //查询商品类别
-        onQuery(){
-            selectTree(this.goodsQueryForm).then(response=>{
-                if (response.code === 200) {
-                    if(response.data == null){
-                        this.tableData = []
-                        console.log(response.data);
-                        this.total = 0;
-                        this.$message('查询成功');
-                    }else{
-                        this.tableData = response.data.records
-                        this.total = response.data.total;
-                        this.$message('查询成功');
-                    }
-              } else {
-                this.$message('查询失败，请联系管理员');
-              }
-            })
-        },
-        handleChange(){
-        },
-        //提交商品类别
-        dooSubmit(){
-            this.$refs['form'].validate(valid => {
-                if (valid) {
-                    //新增一级分类
-                    if(this.form.pid == '' || this.form.pid == undefined ){
-                        this.form.pid = 0
-                    }
-                    //新增二级
-                    insertCvsGoods(this.form).then(response=>{
-                        if (response.code === 200) {
-                           this.rest()
-                            this.$message('新增成功');
-                        }else{
-                            this.$message('新增失败 请联系管理员');
-                        }
-
-                    })
-
-
-                }
-            })
-        },
-        rest(){
-            this.dialogFormVisible = false
-            this.resetForm();
-            this.goodsOptions = []
-        },
-        // 取消提交
-        cancelSubmit(){
-            this.$refs.form.resetFields();//清空
-            this.form.categoryName = ''
-            this.form.pid = ''
-            this.form.status = ''
-            this.form.sorted = 0
-            this.dialogFormVisible = false
-        },
-        // 分页查询
-        getList(){
-            selectTree(this.queryParams).then(response => {
-                if(response.code == 200){
-                    if(response.data == null){
-                        this.tableData = [];
-                        this.total = 0;
-                    }else{
-                        this.tableData = response.data.records;
-                        this.total = response.data.total;
-                    }
-                }else{
-                    this.$message('查询失败 请联系管理员')
-                }
             });
-        },
+          } else {
-        // 取消查询
+            insertCvsGoods(this.form).then(response => {
-        resetForm(){
+              this.$modal.msgSuccess("分类添加成功");
-            this.goodsQueryForm.categoryName = ''
+              this.open = false;
-            this.goodsQueryForm.status = ''
+              this.getList();
-            this.getList()
+            });
-        },
+          }
-
+        }
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 修改按钮操作
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      selectParentById(id).then(response => {
+        console.log(response)
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑分类";
+      });
+    },
+    // 删除按钮操作
+    handleDelete(row) {
+      const name = row.categoryName
+      this.$modal.confirm('确定删除"' + name + '"的分类信息？').then(function() {
+        // return deleteMember(row.id);
+        return deleteBYId(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.multiple = !selection.length
+    },
+    // 排序触发事件
+    handleSortChange(column, prop, order) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
     },
 };
 </script>
 
 <style lang="scss" scoped>
-.tTop{
+  .tTop{
     display: flex;
     justify-content: space-between;
     align-items: center;
     margin-bottom: 10px;
-}
+  }
-
+  .pageSty{
-.pageSty{
     display: flex;
     justify-content: center;
     margin-left: 250px;
-}
+  }
-
+  .app-container{
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+  }
 </style>

fuintAdmin/src/views/member/fixingLevel.vue

@@ -109,7 +109,7 @@
           icon="el-icon-document-copy"
           @click="handleAddMembers"
           v-hasPermi="['member:add']"
-        >新增用户认证</el-button>
+        >批量用户认证</el-button>
         <el-table ref="tables" v-loading="loading" :data="listMember"
                   @selection-change="handleSelectionChange" :default-sort="defaultSort"
                   @sort-change="handleSortChange">
@@ -183,7 +183,11 @@
                   @selection-change="handleSelectionChange"
                   :default-sort="defaultSort"
                   @sort-change="handleSortChange">
-          <el-table-column label="认证类型名称" prop="name" align="center"/>
+          <el-table-column label="认证类型名称" align="center" prop="name">
+            <template slot-scope="scope">
+              {{ scope.row.name }}
+            </template>
+          </el-table-column>
           <el-table-column label="优惠类型" align="center" prop="discountType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.yhlx" :value="scope.row.discountType"/>
@@ -1222,6 +1226,7 @@ export default {
               this.$modal.msgSuccess("用户认证信息更新成功");
               this.openMember = false;
               this.isEdit = false;
+              this.reset1();
               this.getListMember();
             });
           } else {
@@ -1238,6 +1243,7 @@ export default {
                     addCertifiedMember(this.form1).then(response => {
                       this.$modal.msgSuccess("新增用户认证信息成功");
                       this.openMember = false;
+                      this.reset1();
                       this.getListMember();
                     });
                   }

fuintAdmin/src/views/staff/list.vue

@@ -150,7 +150,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 <!--        <el-row>-->
 <!--          <el-col :span="24">-->
@@ -216,7 +216,7 @@
         </el-col>
         </el-row>
         <el-row>
-          <el-col :span="9" style="display: flex;margin-bottom: 20px">
+          <el-col :span="8" style="display: flex;margin-bottom: 20px">
             <template>
               <span style="margin-right: 10px">核销权限</span>
               <el-checkbox-group v-model="writeOff" ref="" @change="getCheckbox">
@@ -229,8 +229,8 @@
               </el-checkbox-group>
             </template>
           </el-col>
-          <el-col :span="15" style="display: flex">
+          <el-col :span="16" style="display: flex">
-            <span style="margin-right: 10px">审核权限</span>
+            <span style="margin-right: 10px;width: 70px">审核权限</span>
             <el-checkbox-group v-model="auditPrem" @change="getCheckbox">
               <el-checkbox
                 v-for="dict in dict.type.shqx"

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java

@@ -8,6 +8,7 @@ import com.fuint.business.convenienceSore.vo.CvsGoodsVo;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
@@ -58,7 +59,7 @@ public class CvsGoodsController extends BaseController {
         return getSuccessResult(cvsGoods);
     }
     //删除
-    @DeleteMapping("detele/{id}")
+    @DeleteMapping("/{id}")
     public ResponseObject selectDeleteId(@PathVariable Integer id)
     {
 
@@ -68,4 +69,9 @@ public class CvsGoodsController extends BaseController {
 
     }
 
+    @PutMapping
+    public ResponseObject edit(@Validated @RequestBody CvsGoods goods){
+        int row = cvsGoodsService.updateCvsGood(goods);
+        return getSuccessResult(row);
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/SupplierController.java

@@ -0,0 +1,75 @@
+package com.fuint.business.convenienceSore.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.convenienceSore.entity.Supplier;
+import com.fuint.business.convenienceSore.service.SupplierService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/business/convenience/supplier")
+public class SupplierController extends BaseController {
+    @Autowired
+    private SupplierService supplierService;
+
+    /**
+     * 根据条件查询供应商信息
+     * @param supplier
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/list")
+    public ResponseObject list(Supplier supplier,
+                               @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                               @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<Supplier> list = supplierService.selectSupplierList(page,supplier);
+        return getSuccessResult(list);
+    }
+
+    /**
+     * 根据id查询会员等级信息
+     * @param id
+     * @return
+     */
+    @GetMapping("/{id}")
+    public ResponseObject staffInfo(@PathVariable Integer id){
+        Supplier supplier = supplierService.selectSupplierById(id);
+        return getSuccessResult(supplier);
+    }
+
+    /**
+     * 删除会员等级信息
+     * @return
+     */
+    @DeleteMapping("/{id}")
+    public ResponseObject remove(@PathVariable Integer id){
+        supplierService.deleteSupplierById(id);
+        return getSuccessResult("操作成功");
+    }
+
+    /**
+     * 添加会员等级信息
+     * @param supplier
+     * @return
+     */
+    @PostMapping
+    public ResponseObject add(@Validated @RequestBody Supplier supplier){
+        return getSuccessResult(supplierService.insertSupplier(supplier));
+    }
+
+    /**
+     * 修改会员等级信息
+     * @param supplier
+     * @return
+     */
+    @PutMapping
+    public ResponseObject edit(@Validated @RequestBody Supplier supplier){
+        return getSuccessResult(supplierService.updateSupplier(supplier));
+    }
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/CvsGoods.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author :admin
  * @date : 2023/10/16
@@ -17,7 +19,8 @@ import lombok.Data;
 @Data
 @TableName("cvs_goods")
 @ApiModel(value = "CvsGoods对象", description = "便利店表")
-public class CvsGoods extends BaseEntity {
+public class CvsGoods extends BaseEntity  implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     //主键
     @ApiModelProperty("自增ID")

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java

@@ -0,0 +1,110 @@
+package com.fuint.business.convenienceSore.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 商品表(Goods)实体类
+ */
+@Data
+@TableName("mt_goods")
+@ApiModel(value = "LJGoods对象", description = "商品表")
+public class LJGoods extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 所属店铺ID
+     */
+    @ApiModelProperty("所属店铺ID")
+    private Integer storeId;
+    /**
+     * 商品名称
+     */
+    @ApiModelProperty("商品名称")
+    private String name;
+    /**
+     * 商品分类ID
+     */
+    @ApiModelProperty("商品分类ID")
+    private Integer cvsGoodId;
+    /**
+     * 商品编码（条码）
+     */
+    @ApiModelProperty("商品编码（条码）")
+    private String goodsNo;
+    /**
+     * 商品拼音码
+     */
+    @ApiModelProperty("商品拼音码")
+    private String pinyinCode;
+    /**
+     * 货架号
+     */
+    @ApiModelProperty("货架号")
+    private Integer shelfNumber;
+    /**
+     * 进货价
+     */
+    @ApiModelProperty("进货价")
+    private Double buyingPrice;
+    /**
+     * 零售价
+     */
+    @ApiModelProperty("零售价")
+    private Double retailPrice;
+    /**
+     * 会员价
+     */
+    @ApiModelProperty("会员价")
+    private Double memberPrice;
+    /**
+     * 库存
+     */
+    @ApiModelProperty("库存")
+    private Integer stock;
+    /**
+     * 单位
+     */
+    @ApiModelProperty("单位")
+    private String unit;
+    /**
+     * 供应商
+     */
+    @ApiModelProperty("供应商id")
+    private Integer supplierId;
+    /**
+     * 可否使用积分抵扣
+     */
+    @ApiModelProperty("可否使用积分抵扣")
+    private String canUsePoint;
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer sort;
+    /**
+     * 商品描述
+     */
+    @ApiModelProperty("商品描述")
+    private String description;
+    /**
+     * 状态：启用、禁用
+     */
+    @ApiModelProperty("状态：启用、禁用")
+    private String status;
+
+}
+

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/Supplier.java

@@ -0,0 +1,59 @@
+package com.fuint.business.convenienceSore.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 供应商表(Supplier)实体类
+ */
+@Data
+@TableName("supplier")
+@ApiModel(value = "Supplier对象", description = "供应商表")
+public class Supplier extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    @ApiModelProperty("自增ID")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 供应商名称
+     */
+    @ApiModelProperty("供应商名称")
+    private String name;
+    /**
+     * 联系人
+     */
+    @ApiModelProperty("联系人")
+    private String contacts;
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty("联系电话")
+    private String mobile;
+    /**
+     * 联系地址
+     */
+    @ApiModelProperty("联系地址")
+    private String address;
+    /**
+     * 备注信息
+     */
+    @ApiModelProperty("备注信息")
+    private String remark;
+    /**
+     * 商铺id
+     */
+    @ApiModelProperty("商铺id")
+    private Integer storeId;
+}
+

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java

@@ -19,6 +19,9 @@ public interface CvsGoodsMapper extends BaseMapper<CvsGoods> {
     //查找一级菜单
     IPage<CvsGoodsVo> selectCvsGoodsList(Page page , @Param("goods") CvsGoods goods);
 
+    //查找一级菜单
+    IPage<CvsGoods> queryCvsGoodsList(Page page , @Param("goods") CvsGoods goods);
+
     //查找二级菜单
     List<CvsGoodsVo> selectCvsGoodsTreeList(CvsGoods goods);
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/LJGoodsMapper.java

@@ -0,0 +1,18 @@
+package com.fuint.business.convenienceSore.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.convenienceSore.entity.LJGoods;
+import com.fuint.business.userManager.entity.LJUser;
+import org.apache.ibatis.annotations.Param;
+
+public interface LJGoodsMapper extends BaseMapper<LJGoods> {
+    /**
+     * 根据条件分页查询会员信息
+     * @param page
+     * @param goods
+     * @return
+     */
+    public IPage<LJGoods> selectLJGoodsList(Page page, @Param("goods") LJGoods goods);
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/SupplierMapper.java

@@ -0,0 +1,18 @@
+package com.fuint.business.convenienceSore.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.convenienceSore.entity.LJGoods;
+import com.fuint.business.convenienceSore.entity.Supplier;
+import org.apache.ibatis.annotations.Param;
+
+public interface SupplierMapper extends BaseMapper<Supplier> {
+    /**
+     * 根据条件分页查询会员信息
+     * @param page
+     * @param supplier
+     * @return
+     */
+    public IPage<Supplier> selectSupplierList(Page page, @Param("supplier") Supplier supplier);
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml

@@ -6,6 +6,10 @@
         select id,pid,category_name,code,sorted, status, create_time, create_by, update_time, update_by from cvs_goods
     </sql>
 
+    <sql id="selectCvsGood">
+        select * from cvs_goods
+    </sql>
+
     <!--判断新增是否重复    -->
     <select id="selectGoodsList" parameterType="com.fuint.business.convenienceSore.entity.CvsGoods" resultType="com.fuint.business.convenienceSore.entity.CvsGoods" >
         <include refid="selectCvsGoods"></include>
@@ -30,7 +34,7 @@
         pTable.id,
         pTable.pid,
         pTable.category_name,
-        pTable.`CODE`,
+        pTable.`code`,
         pTable.sorted,
         pTable.`STATUS`,
         pTable.create_time,
@@ -42,6 +46,7 @@
         left join
         (SELECT * from cvs_goods WHERE pid != 0) cTable on pTable.id = cTable.pid
         <where>
+            pTable.store_id = #{goods.storeId}
             <if test="goods.status != null and goods.status != ''">
                 and  pTable.status = #{goods.status}
             </if>
@@ -52,6 +57,18 @@
         </where>
         group by pTable.id
         order by sorted
+
+<!--        <include refid="selectCvsGood"></include>-->
+<!--        <where>-->
+<!--            store_id = #{goods.storeId}-->
+<!--            <if test="goods.categoryName != null and goods.categoryName != ''">-->
+<!--                and category_name like concat('%', #{goods.categoryName}, '%')-->
+<!--            </if>-->
+<!--            <if test="goods.status != null and goods.status != ''">-->
+<!--                and status = #{goods.status}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        order by sorted-->
     </select>
 
     <!--查找二级分类-->
@@ -82,6 +99,22 @@
         </where>
         order by sorted
     </select>
+
+    <select id="queryCvsGoodsList" resultType="com.fuint.business.convenienceSore.entity.CvsGoods">
+        <include refid="selectCvsGood"></include>
+        <where>
+            store_id = #{goods.storeId} and pid = 0
+            <if test="goods.categoryName != null and goods.categoryName != ''">
+                and category_name like concat('%', #{goods.categoryName}, '%')
+            </if>
+            <if test="goods.status != null and goods.status != ''">
+                and status = #{goods.status}
+            </if>
+        </where>
+        order by sorted
+    </select>
+
+<!--    根据id删除分类信息-->
     <delete id="deleteByIdVo">
         DELETE FROM cvs_goods WHERE id=#{id}
     </delete>

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/LJGoodsMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.convenienceSore.mapper.LJGoodsMapper">
+    <sql id="selectLJGoods">
+        select * from mt_goods
+    </sql>
+
+    <select id="selectLJGoodsList" resultType="com.fuint.business.convenienceSore.entity.LJGoods">
+        <include refid="selectLJGoods"></include>
+        <where>
+            store_id = #{goods.storeId}
+            <!--            <if test="pid != null">-->
+<!--                and pid = #{pid}-->
+<!--            </if>-->
+<!--            <if test="categoryName != null and categoryName != ''">-->
+<!--                and category_name = #{categoryName}-->
+<!--            </if>-->
+<!--            <if test="sorted != null and sorted != ''">-->
+<!--                and sorted = #{sorted}-->
+<!--            </if>-->
+        </where>
+    </select>
+</mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/SupplierMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.convenienceSore.mapper.SupplierMapper">
+    <sql id="selectSupplier">
+        select * from supplier
+    </sql>
+
+    <select id="selectSupplierList" resultType="com.fuint.business.convenienceSore.entity.Supplier">
+        <include refid="selectSupplier"></include>
+        <where>
+            store_id = #{goods.storeId}
+            <!--            <if test="pid != null">-->
+<!--                and pid = #{pid}-->
+<!--            </if>-->
+<!--            <if test="categoryName != null and categoryName != ''">-->
+<!--                and category_name = #{categoryName}-->
+<!--            </if>-->
+<!--            <if test="sorted != null and sorted != ''">-->
+<!--                and sorted = #{sorted}-->
+<!--            </if>-->
+        </where>
+    </select>
+</mapper>

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java

@@ -46,4 +46,10 @@ public interface CvsGoodsService {
      * @param id
      */
     void deleteByIdVo(Integer id);
+
+    /**
+     * 修改商品信息
+     * @param goods
+     */
+    int updateCvsGood(CvsGoods goods);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java

@@ -0,0 +1,41 @@
+package com.fuint.business.convenienceSore.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.convenienceSore.entity.LJGoods;
+
+public interface LJGoodsService {
+    /**
+     * 根据条件分页查询固定等级信息
+     * @param page
+     * @return
+     */
+    public IPage<LJGoods> selectLJGoodsList(Page page, LJGoods goods);
+
+    /**
+     * 根据id查询固定等级信息
+     * @param id
+     * @return
+     */
+    public LJGoods selectLJGoodsById(int id);
+
+    /**
+     * 根据id删除固定等级信息
+     * @param id
+     */
+    public void deleteLJGoodsById(Integer id);
+
+    /**
+     * 增加固定等级信息
+     * @param goods
+     * @return
+     */
+    public int insertLJGoods(LJGoods goods);
+
+    /**
+     * 修改固定等级信息
+     * @param goods
+     * @return
+     */
+    public int updateLJGoods(LJGoods goods);
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/SupplierService.java

@@ -0,0 +1,44 @@
+package com.fuint.business.convenienceSore.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.convenienceSore.entity.Supplier;
+
+/**
+ * 供应商信息 业务层
+ */
+public interface SupplierService {
+    /**
+     * 根据条件分页查询供应商信息
+     * @param page
+     * @return
+     */
+    public IPage<Supplier> selectSupplierList(Page page, Supplier supplier);
+
+    /**
+     * 根据id查询供应商信息
+     * @param id
+     * @return
+     */
+    public Supplier selectSupplierById(int id);
+
+    /**
+     * 根据id删除供应商信息
+     * @param id
+     */
+    public void deleteSupplierById(Integer id);
+
+    /**
+     * 增加供应商信息
+     * @param supplier
+     * @return
+     */
+    public int insertSupplier(Supplier supplier);
+
+    /**
+     * 修改供应商信息
+     * @param supplier
+     * @return
+     */
+    public int updateSupplier(Supplier supplier);
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java

@@ -25,7 +25,9 @@ import java.util.stream.Collectors;
 @Service
 public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> implements CvsGoodsService {
 
-    /**添加商品信息*/
+    /**
+     * 添加商品信息
+     */
     @Transactional
     public int insertCvsGoods( CvsGoods cvsGoods){
         //查找分类名称是否存在
@@ -40,8 +42,16 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
         }
     }
 
-
+    /**
+     * 根据条件分页查询商品信息
+     * @param page
+     * @param g
+     * @return
+     */
     public IPage<CvsGoodsVo> selectTree(Page page, CvsGoods g){
+        AccountInfo nowAccountInfo1 = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo1.getStoreId();
+        g.setStoreId(storeId);
         // 查询全部数据
         IPage<CvsGoodsVo> cvsGoodsPage= baseMapper.selectCvsGoodsList(page,g);//一节点
         List<CvsGoodsVo> cvsGoodsList = cvsGoodsPage.getRecords();
@@ -60,6 +70,7 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
                 cvsGoodsVo.setCategoryName(goods.getCategoryName());
                 cvsGoodsVo.setPid(goods.getPid());
                 cvsGoodsVo.setStatus(goods.getStatus());
+                cvsGoodsVo.setCode(goods.getCode());
                 cvsGoodsVo.setCreateTime(new Date());
                 AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
                 cvsGoodsVo.setCreateBy(nowAccountInfo.getId().toString());
@@ -109,9 +120,23 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
     public  CvsGoods selectParentById(Integer id){
         return baseMapper.selectById(id);
     }
-//    删除
+
+    /**
+     * 根据id删除商品信息
+     * @param id
+     */
     @Override
     public void deleteByIdVo(Integer id){
         baseMapper.deleteByIdVo(id);
     }
+
+    /**
+     * 修改商品信息
+     * @param goods
+     */
+    @Override
+    public int updateCvsGood(CvsGoods goods) {
+        int row = baseMapper.updateById(goods);
+        return row;
+    }
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java

@@ -0,0 +1,75 @@
+package com.fuint.business.convenienceSore.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.convenienceSore.entity.LJGoods;
+import com.fuint.business.convenienceSore.mapper.LJGoodsMapper;
+import com.fuint.business.convenienceSore.service.LJGoodsService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+/**
+ * 固定等级信息 业务层
+ */
+@Service
+public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> implements LJGoodsService {
+    /**
+     * 根据条件分页查询固定等级信息
+     * @param page
+     * @return
+     */
+    @Override
+    public IPage<LJGoods> selectLJGoodsList(Page page, LJGoods goods) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        goods.setStoreId(storeId);
+        IPage<LJGoods> goodsIPage = baseMapper.selectLJGoodsList(page, goods);
+        return goodsIPage;
+    }
+
+    /**
+     * 根据id查询固定等级信息
+     * @param id
+     * @return
+     */
+    @Override
+    public LJGoods selectLJGoodsById(int id) {
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 根据id删除固定等级信息
+     * @param id
+     */
+    @Override
+    public void deleteLJGoodsById(Integer id) {
+        baseMapper.deleteById(id);
+    }
+
+    /**
+     * 增加固定等级信息
+     * @param goods
+     * @return
+     */
+    @Override
+    public int insertLJGoods(LJGoods goods) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        goods.setStoreId(storeId);
+        int row = baseMapper.insert(goods);
+        return row;
+    }
+
+    /**
+     * 修改固定等级信息
+     * @param goods
+     * @return
+     */
+    @Override
+    public int updateLJGoods(LJGoods goods) {
+        int row = baseMapper.updateById(goods);
+        return row;
+    }
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/SupplierServiceImpl.java

@@ -0,0 +1,75 @@
+package com.fuint.business.convenienceSore.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.convenienceSore.entity.Supplier;
+import com.fuint.business.convenienceSore.mapper.SupplierMapper;
+import com.fuint.business.convenienceSore.service.SupplierService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商 业务层
+ */
+@Service
+public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> implements SupplierService {
+    /**
+     * 根据条件分页查询供应商信息
+     * @param page
+     * @return
+     */
+    @Override
+    public IPage<Supplier> selectSupplierList(Page page, Supplier supplier) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        supplier.setStoreId(storeId);
+        IPage<Supplier> supplierIPage = baseMapper.selectSupplierList(page, supplier);
+        return supplierIPage;
+    }
+
+    /**
+     * 根据id查询供应商信息
+     * @param id
+     * @return
+     */
+    @Override
+    public Supplier selectSupplierById(int id) {
+        return baseMapper.selectById(id);
+    }
+
+    /**
+     * 根据id删除供应商信息
+     * @param id
+     */
+    @Override
+    public void deleteSupplierById(Integer id) {
+        baseMapper.deleteById(id);
+    }
+
+    /**
+     * 增加供应商信息
+     * @param supplier
+     * @return
+     */
+    @Override
+    public int insertSupplier(Supplier supplier) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        supplier.setStoreId(storeId);
+        int row = baseMapper.insert(supplier);
+        return row;
+    }
+
+    /**
+     * 修改供应商信息
+     * @param supplier
+     * @return
+     */
+    @Override
+    public int updateSupplier(Supplier supplier) {
+        int row = baseMapper.updateById(supplier);
+        return row;
+    }
+}

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/CertifiedMember.java

@@ -71,6 +71,11 @@ public class CertifiedMember extends BaseEntity implements Serializable {
      */
     @ApiModelProperty("认证状态")
     private String status;
+    /**
+     * 商户id
+     */
+    @ApiModelProperty("商户id")
+    private Integer storeId;
     /**
      * 图片URL
      */

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/FixingLevel.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fuint.framework.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -22,7 +23,7 @@ import java.util.List;
 @Getter
 @Setter
 @TableName("fixing_level")
-@ApiModel(value = "FixingLevel对象", description = "")
+@ApiModel(value = "FixingLevel对象", description = "固定等级表")
 public class FixingLevel extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -117,6 +118,11 @@ public class FixingLevel extends BaseEntity implements Serializable {
      */
     @ApiModelProperty("二维码")
     private String qrCode;
+    /**
+     * 商户id
+     */
+    @ApiModelProperty("商户id")
+    private Integer storeId;
 
     @TableField(exist = false)
     private List<JSONObject> gasolineRuleList;

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/CertifiedMemberMapper.xml

@@ -8,6 +8,7 @@
     <select id="selectCertifiedMemberList" resultType="com.fuint.business.userManager.entity.CertifiedMember">
         <include refid="selectCertifiedMember"></include>
         <where>
+            store_id = #{certifiedMember.storeId}
             <if test="certifiedMember.mobile != null and certifiedMember.mobile != ''">
                 and mobile like concat('%', #{certifiedMember.mobile}, '%')
             </if>

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FixingLevelMapper.xml

@@ -8,6 +8,7 @@
     <select id="selectFixingLevelList" resultType="com.fuint.business.userManager.entity.FixingLevel">
         <include refid="selectFixingLevel"></include>
         <where>
+            store_id = #{fixingLevel.storeId}
             <if test="fixingLevel.status != null and fixingLevel.status != ''">
                 and status = #{fixingLevel.status}
             </if>

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

@@ -14,7 +14,9 @@ import com.fuint.business.userManager.mapper.FixingLevelMapper;
 import com.fuint.business.userManager.service.CertifiedMemberService;
 import com.fuint.business.userManager.service.FixingLevelService;
 import com.fuint.business.userManager.service.LJUserService;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.StringUtils;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,6 +37,9 @@ public class CertifiedMemberServiceImpl extends ServiceImpl<CertifiedMemberMappe
      */
     @Override
     public IPage<CertifiedMember> selectCertifiedMemberList(Page page, CertifiedMember certifiedMember) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        certifiedMember.setStoreId(storeId);
         IPage<CertifiedMember> fixingLevelIPage = baseMapper.selectCertifiedMemberList(page, certifiedMember);
         for (CertifiedMember record : fixingLevelIPage.getRecords()) {
             if (StringUtils.isNotEmpty(record.getAttestationData())){
@@ -115,6 +120,9 @@ public class CertifiedMemberServiceImpl extends ServiceImpl<CertifiedMemberMappe
             certifiedMember.setName(ljUser.getName());
             certifiedMember.setUserId(ljUser.getId());
         }
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        certifiedMember.setStoreId(storeId);
         int row = baseMapper.insert(certifiedMember);
         return row;
     }

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

@@ -9,7 +9,9 @@ import com.fuint.business.userManager.entity.FixingLevel;
 import com.fuint.business.userManager.entity.LJUserGrade;
 import com.fuint.business.userManager.mapper.FixingLevelMapper;
 import com.fuint.business.userManager.service.FixingLevelService;
+import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.StringUtils;
+import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -24,6 +26,9 @@ public class FixingLevelServiceImpl extends ServiceImpl<FixingLevelMapper, Fixin
      */
     @Override
     public IPage<FixingLevel> selectFixingLevelList(Page page, FixingLevel fixingLevel) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        fixingLevel.setStoreId(storeId);
         IPage<FixingLevel> fixingLevelIPage = baseMapper.selectFixingLevelList(page, fixingLevel);
         for (FixingLevel record : fixingLevelIPage.getRecords()) {
             if (StringUtils.isNotEmpty(record.getGasolineRule())){
@@ -65,6 +70,9 @@ public class FixingLevelServiceImpl extends ServiceImpl<FixingLevelMapper, Fixin
      */
     @Override
     public int insertFixingLevel(FixingLevel fixingLevel) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        fixingLevel.setStoreId(storeId);
         int row = baseMapper.insert(fixingLevel);
         return row;
     }