提交关于我们及api接口

smart-admin/src/main/java/com/huijy/web/controller/api/ApiIndexController.java

@@ -3,14 +3,13 @@ package com.huijy.web.controller.api;
 import com.huijy.common.core.domain.AjaxResult;
 import com.huijy.common.core.page.TableDataInfo;
 import com.huijy.management.domain.*;
-import com.huijy.management.service.IAboutUsService;
-import com.huijy.management.service.IContentService;
-import com.huijy.management.service.IMemberLocationService;
-import com.huijy.management.service.IMemberService;
+import com.huijy.management.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import org.apache.catalina.Store;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -32,6 +31,10 @@ public class ApiIndexController extends ApiAbstractController {
     private IAboutUsService aboutUsService;
     @Autowired
     private IContentService contentService;
+    @Autowired
+    private IShopService shopService;
+    @Autowired
+    private IShopSalesRecordService shopSalesRecordService;
 
     @PostMapping("/pushLatLng")
     @ApiOperation("上传会员坐标")
@@ -61,9 +64,9 @@ public class ApiIndexController extends ApiAbstractController {
     @PostMapping("/pushHelp")
     @ApiOperation("上传会员拨打记录")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "lat", value = "坐标的lat", paramType = "body"),
-            @ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body"),
-            @ApiImplicitParam(name = "phone", value = "求助电话", paramType = "body")
+            @ApiImplicitParam(name = "lat", value = "坐标的lat",dataType = "String", paramType = "body"),
+            @ApiImplicitParam(name = "lng", value = "坐标的lng",dataType = "String",paramType = "body"),
+            @ApiImplicitParam(name = "phone", value = "求助电话",dataType = "String", paramType = "body")
     })
     public AjaxResult pushHelp(@ApiIgnore Member member, @RequestBody Map params) {
         String lat = (String) params.get("lat");
@@ -105,4 +108,64 @@ public class ApiIndexController extends ApiAbstractController {
         return getDataTable(list);
 
     }
+
+    //门店开通申请
+    @PostMapping("/shopApply")
+    @ApiOperation("商铺开通申请")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", value = "商铺名称",required = true,paramType = "body"),
+            @ApiImplicitParam(name = "addres", value = "地址", paramType = "body"),
+            @ApiImplicitParam(name = "bossName", value = "老板名称",required = true, paramType = "body"),
+            @ApiImplicitParam(name = "bossPhone", value = "老板电话",required = true, paramType = "body"),
+            @ApiImplicitParam(name = "businessHours", value = "营业时间", paramType = "body"),
+            @ApiImplicitParam(name = "briefContent", value = "简介", paramType = "body"),
+            @ApiImplicitParam(name = "lat", value = "坐标的lat", paramType = "body"),
+            @ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body")
+    })
+    public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody Shop shop) {
+        if (shop == null){
+            AjaxResult.error("提交数据为空");
+        }
+        shop.setAuditFlag("0");
+        shop.setEnableFlag("0");
+        shopService.insertShop(shop);
+        return AjaxResult.success();
+    }
+
+    //更新门店坐标
+    @PostMapping("/updateLatLng")
+    @ApiOperation("更新门店坐标")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "shopId", value = "商铺id",required = true,paramType = "body"),
+            @ApiImplicitParam(name = "lat", value = "坐标的lat", paramType = "body"),
+            @ApiImplicitParam(name = "lng", value = "坐标的lng", paramType = "body")
+    })
+    public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody Map params) {
+        String lat = (String) params.get("lat");
+        String lng = (String) params.get("lng");
+        Integer shopId = (Integer) params.get("shopId");
+        if (shopId==null || shopId<=0){
+            return  AjaxResult.error("店铺id不能为空");
+        }
+        Shop shop = shopService.selectShopByShopId(shopId.longValue());
+        if (shop == null){
+            return  AjaxResult.error("获取店铺信息出错");
+        }
+        shop.setLat(lat);
+        shop.setLng(lng);
+        shopService.updateShop(shop);
+        return AjaxResult.success();
+    }
+
+    //门店数据上报
+
+    @PostMapping("/pushRecord")
+    @ApiOperation("门店数据上报")
+    public AjaxResult storeApply(@ApiIgnore Member member, @RequestBody ShopSalesRecord shopSalesRecord) {
+        if (shopSalesRecord==null){
+            AjaxResult.error("上传数据为空");
+        }
+        shopSalesRecordService.insertShopSalesRecord(shopSalesRecord);
+        return AjaxResult.success();
+    }
 }

smart-system/src/main/java/com/huijy/management/domain/Shop.java

@@ -57,7 +57,7 @@ public class Shop extends BaseEntity
 
     /** 简介 */
     @Excel(name = "简介")
-    private String briefContent;
+        private String briefContent;
 
     /** 详情 */
     @Excel(name = "详情")

smart-ui/src/api/management/aboutUs.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询关于我们列表
+export function listAboutUs(query) {
+  return request({
+    url: '/management/aboutUs/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询关于我们详细
+export function getAboutUs(aboutUsId) {
+  return request({
+    url: '/management/aboutUs/' + aboutUsId,
+    method: 'get'
+  })
+}
+
+// 新增关于我们
+export function addAboutUs(data) {
+  return request({
+    url: '/management/aboutUs',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改关于我们
+export function updateAboutUs(data) {
+  return request({
+    url: '/management/aboutUs',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除关于我们
+export function delAboutUs(aboutUsId) {
+  return request({
+    url: '/management/aboutUs/' + aboutUsId,
+    method: 'delete'
+  })
+}
+
+// 导出关于我们
+export function exportAboutUs(query) {
+  return request({
+    url: '/management/aboutUs/export',
+    method: 'get',
+    params: query
+  })
+}

smart-ui/src/views/management/aboutUs/index-back.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['management:aboutUs:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['management:aboutUs:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['management:aboutUs:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['management:aboutUs:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="aboutUsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="关于我们id" align="center" prop="aboutUsId" />
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="求助电话" align="center" prop="helpPhone" />
+      <el-table-column label="简介1" align="center" prop="briefText1" />
+      <el-table-column label="简介2" align="center" prop="briefText2" />
+      <el-table-column label="简介3" align="center" prop="briefText3" />
+      <el-table-column label="简介4" align="center" prop="briefText4" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['management:aboutUs:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['management:aboutUs:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改关于我们对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="求助电话" prop="helpPhone">
+          <el-input v-model="form.helpPhone" placeholder="请输入求助电话" />
+        </el-form-item>
+        <el-form-item label="展示图片">
+          <imageUpload v-model="form.showPictures"/>
+        </el-form-item>
+        <el-form-item label="简介1" prop="briefText1">
+          <el-input v-model="form.briefText1" placeholder="请输入简介1" />
+        </el-form-item>
+        <el-form-item label="简介2" prop="briefText2">
+          <el-input v-model="form.briefText2" placeholder="请输入简介2" />
+        </el-form-item>
+        <el-form-item label="简介3" prop="briefText3">
+          <el-input v-model="form.briefText3" placeholder="请输入简介3" />
+        </el-form-item>
+        <el-form-item label="简介4" prop="briefText4">
+          <el-input v-model="form.briefText4" placeholder="请输入简介4" />
+        </el-form-item>
+        <el-form-item label="详情">
+          <editor v-model="form.content" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="背景图片1">
+          <imageUpload v-model="form.bgImg1"/>
+        </el-form-item>
+        <el-form-item label="背景图片2">
+          <imageUpload v-model="form.bgImg2"/>
+        </el-form-item>
+        <el-form-item label="背景图片3">
+          <imageUpload v-model="form.bgImg3"/>
+        </el-form-item>
+        <el-form-item label="背景图片4">
+          <imageUpload v-model="form.bgImg4"/>
+        </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>
+  </div>
+</template>
+
+<script>
+import { listAboutUs, getAboutUs, delAboutUs, addAboutUs, updateAboutUs, exportAboutUs } from "@/api/management/aboutUs";
+
+export default {
+  name: "AboutUs",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 关于我们表格数据
+      aboutUsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询关于我们列表 */
+    getList() {
+      this.loading = true;
+      listAboutUs(this.queryParams).then(response => {
+        this.aboutUsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        aboutUsId: null,
+        title: null,
+        helpPhone: null,
+        showPictures: null,
+        briefText1: null,
+        briefText2: null,
+        briefText3: null,
+        briefText4: null,
+        content: null,
+        bgImg1: null,
+        bgImg2: null,
+        bgImg3: null,
+        bgImg4: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.aboutUsId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加关于我们";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const aboutUsId = row.aboutUsId || this.ids
+      getAboutUs(aboutUsId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改关于我们";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.aboutUsId != null) {
+            updateAboutUs(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAboutUs(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const aboutUsIds = row.aboutUsId || this.ids;
+      this.$confirm('是否确认删除关于我们编号为"' + aboutUsIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delAboutUs(aboutUsIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有关于我们数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportAboutUs(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

smart-ui/src/views/management/aboutUs/index.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="form.title" placeholder="请输入标题" />
+      </el-form-item>
+      <el-form-item label="求助电话" prop="helpPhone">
+        <el-input v-model="form.helpPhone" placeholder="请输入求助电话" />
+      </el-form-item>
+      <el-form-item label="展示图片">
+        <imageUpload v-model="form.showPictures" />
+      </el-form-item>
+      <el-form-item label="简介1" prop="briefText1">
+        <el-input v-model="form.briefText1" placeholder="请输入简介1" />
+      </el-form-item>
+      <el-form-item label="简介2" prop="briefText2">
+        <el-input v-model="form.briefText2" placeholder="请输入简介2" />
+      </el-form-item>
+      <el-form-item label="简介3" prop="briefText3">
+        <el-input v-model="form.briefText3" placeholder="请输入简介3" />
+      </el-form-item>
+      <el-form-item label="简介4" prop="briefText4">
+        <el-input v-model="form.briefText4" placeholder="请输入简介4" />
+      </el-form-item>
+      <el-form-item label="详情">
+        <editor v-model="form.content" :min-height="192" />
+      </el-form-item>
+      <el-form-item label="背景图片1">
+        <imageUpload v-model="form.bgImg1" />
+      </el-form-item>
+      <el-form-item label="背景图片2">
+        <imageUpload v-model="form.bgImg2" />
+      </el-form-item>
+      <el-form-item label="背景图片3">
+        <imageUpload v-model="form.bgImg3" />
+      </el-form-item>
+      <el-form-item label="背景图片4">
+        <imageUpload v-model="form.bgImg4" />
+      </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>
+  </div>
+</template>
+
+<script>
+import { getAboutUs, addAboutUs, updateAboutUs } from "@/api/management/aboutUs";
+export default {
+  name: "AboutUs",
+  data () {
+    return {
+      // 表单参数
+      form: {}
+    }
+  },
+  methods: {
+    init (aboutUsId) {
+      getAboutUs(aboutUsId).then(response => {
+        if (response.code == 200) {
+          if (response.data != null) {
+            this.form = response.data;
+          } else {
+            this.reset();
+          }
+        }else{
+            this.msgError("获取信息出错！");
+        }
+      });
+    },
+    // 表单重置
+    reset () {
+      this.form = {
+        aboutUsId: null,
+        title: null,
+        helpPhone: null,
+        showPictures: null,
+        briefText1: null,
+        briefText2: null,
+        briefText3: null,
+        briefText4: null,
+        content: null,
+        bgImg1: null,
+        bgImg2: null,
+        bgImg3: null,
+        bgImg4: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 提交按钮 */
+    submitForm () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.aboutUsId != null) {
+            updateAboutUs(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAboutUs(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+  },
+  created () {
+    this.init(1);
+  },
+}
+</script>
+
+<style>
+</style>