优先级，我的收藏

src/main/java/com/izouma/dingdong/repo/backstage/PriorityRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.dingdong.repo.backstage;
+
+import com.izouma.dingdong.domain.backstage.Priority;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface PriorityRepo extends JpaRepository<Priority, Long>, JpaSpecificationExecutor<Priority> {
+    @Query("update Priority t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+}

src/main/java/com/izouma/dingdong/repo/user/MyCollectionRepo.java

@@ -0,0 +1,8 @@
+package com.izouma.dingdong.repo.user;
+
+import com.izouma.dingdong.domain.user.MyCollection;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface MyCollectionRepo extends JpaRepository<MyCollection, Long>, JpaSpecificationExecutor<MyCollection> {
+}

src/main/java/com/izouma/dingdong/service/backstage/PriorityService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.backstage;
+
+import com.izouma.dingdong.domain.backstage.Priority;
+import com.izouma.dingdong.repo.backstage.PriorityRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class PriorityService {
+
+    private PriorityRepo priorityRepo;
+
+}

src/main/java/com/izouma/dingdong/service/merchant/GoodsService.java

@@ -18,10 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -38,6 +35,8 @@ public class GoodsService {
     private AppraisalService appraisalService;
     private GoodsSpecificationRepo goodsSpecificationRepo;
     private SalesRepo salesRepo;
+    private MerchantSettingsService merchantSettingsService;
+    private MerchantService merchantService;
 
     /**
      * 添加修改商品
@@ -251,9 +250,11 @@ public class GoodsService {
     /*
     商品列表
      */
-    public List<Goods> showAll(GoodType type) {
+    public List<Goods> showAll(GoodType type, Double longitude, Double latitude, Double range) {
 
         //用户3km以内的商品 3km以内的商户
+        Set<Merchant> merchantSet = new HashSet<>(merchantRepo.findAll());
+        List<Merchant> merchantList = merchantService.distanceSorting(merchantSet, longitude, latitude, range);
 
         List<Goods> goodsList = goodsRepo.findAll();
 

src/main/java/com/izouma/dingdong/service/user/MyCollectionService.java

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.user;
+
+import com.izouma.dingdong.domain.user.MyCollection;
+import com.izouma.dingdong.repo.user.MyCollectionRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class MyCollectionService {
+
+    private MyCollectionRepo myCollectionRepo;
+
+}

src/main/java/com/izouma/dingdong/web/backstage/PriorityController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.backstage;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Priority;
+import com.izouma.dingdong.service.backstage.PriorityService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.PriorityRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/priority")
+@AllArgsConstructor
+public class PriorityController extends BaseController {
+    private PriorityService priorityService;
+    private PriorityRepo priorityRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Priority save(@RequestBody Priority record) {
+        if (record.getId() != null) {
+            Priority orig = priorityRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return priorityRepo.save(orig);
+        }
+        return priorityRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Priority> all(PageQuery pageQuery) {
+        return priorityRepo.findAll(toSpecification(pageQuery,Priority.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Priority get(@PathVariable Long id) {
+        return priorityRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        priorityRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Priority> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/dingdong/web/user/MyCollectionController.java

@@ -0,0 +1,63 @@
+package com.izouma.dingdong.web.user;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.user.MyCollection;
+import com.izouma.dingdong.service.user.MyCollectionService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.user.MyCollectionRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/myCollection")
+@AllArgsConstructor
+public class MyCollectionController extends BaseController {
+    private MyCollectionService myCollectionService;
+    private MyCollectionRepo myCollectionRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public MyCollection save(@RequestBody MyCollection record) {
+        if (record.getId() != null) {
+            MyCollection orig = myCollectionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return myCollectionRepo.save(orig);
+        }
+        return myCollectionRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<MyCollection> all(PageQuery pageQuery) {
+        return myCollectionRepo.findAll(toSpecification(pageQuery,MyCollection.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public MyCollection get(@PathVariable Long id) {
+        return myCollectionRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        myCollectionRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<MyCollection> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/MyCollection.json

@@ -0,0 +1 @@
+{"tableName":"MyCollection","className":"MyCollection","remark":"我的收藏","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/java/com/izouma/dingdong","viewPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"merchantId","modelName":"merchantId","remark":"商户ID","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.user.MyCollection","genPackage":"user"}

src/main/resources/genjson/Priority.json

@@ -0,0 +1 @@
+{"tableName":"Priority","className":"Priority","remark":"优先级","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/java/com/izouma/dingdong","viewPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"type","modelName":"type","remark":"类型","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"商户\",\"value\":0},{\"label\":\"商品\",\"value\":1}]"},{"name":"level","modelName":"level","remark":"级别","showInList":true,"showInForm":true,"formType":"number"},{"name":"likes","modelName":"likes","remark":"所需点赞","showInList":true,"showInForm":true,"formType":"number"},{"name":"monthSales","modelName":"monthSales","remark":"所需月销","showInList":true,"showInForm":true,"formType":"number"},{"name":"zeroSalesDay","modelName":"zeroSalesDay","remark":"一个月销量可为0的天数","showInList":true,"showInForm":true,"formType":"number"},{"name":"lessMonthSales","modelName":"lessMonthSales","remark":"月最低销量","showInList":true,"showInForm":true,"formType":"number"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.backstage.Priority","genPackage":"backstage"}

src/main/vue/src/router.js

@@ -398,6 +398,22 @@ const router = new Router({
                     meta: {
                        title: '首页推荐位',
                     },
+               },
+                {
+                    path: '/priorityEdit',
+                    name: 'PriorityEdit',
+                    component: () => import(/* webpackChunkName: "priorityEdit" */ '@/views/PriorityEdit.vue'),
+                    meta: {
+                       title: '优先级编辑',
+                    },
+                },
+                {
+                    path: '/priorityList',
+                    name: 'PriorityList',
+                    component: () => import(/* webpackChunkName: "priorityList" */ '@/views/PriorityList.vue'),
+                    meta: {
+                       title: '优先级',
+                    },
                }
                 /**INSERT_LOCATION**/,
                 {

src/main/vue/src/views/PriorityEdit.vue

@@ -0,0 +1,111 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="172px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="type" label="类型">
+                            <el-select v-model="formData.type" clearable filterable  placeholder="请选择">
+                                <el-option
+                                        v-for="item in typeOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                </el-form-item>
+                <el-form-item prop="level" label="级别">
+                            <el-input-number type="number" v-model="formData.level"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="likes" label="所需点赞">
+                            <el-input-number type="number" v-model="formData.likes"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="monthSales" label="所需月销">
+                            <el-input-number type="number" v-model="formData.monthSales"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="zeroSalesDay" label="一个月销量可为0的天数">
+                            <el-input-number type="number" v-model="formData.zeroSalesDay"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="lessMonthSales" label="月最低销量">
+                            <el-input-number type="number" v-model="formData.lessMonthSales"></el-input-number>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'PriorityEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('priority/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+                            typeOptions:[{"label":"商户","value":0},{"label":"商品","value":1}],
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/priority/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/priority/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/PriorityList.vue

@@ -0,0 +1,185 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable
+                      class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search"
+                       class="filter-item">搜索
+            </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus"
+                       class="filter-item">添加
+            </el-button>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <!--            <el-table-column prop="id" label="ID" width="100">
+                        </el-table-column>-->
+            <el-table-column prop="type" label="类型"
+                             :formatter="typeFormatter"
+            >
+            </el-table-column>
+            <el-table-column prop="level" label="级别"
+            >
+            </el-table-column>
+            <el-table-column prop="likes" label="所需点赞"
+            >
+            </el-table-column>
+            <el-table-column prop="monthSales" label="所需月销"
+            >
+            </el-table-column>
+            <el-table-column prop="zeroSalesDay" label="一个月销量可为0的天数"
+            >
+            </el-table-column>
+            <el-table-column prop="lessMonthSales" label="月最低销量"
+            >
+            </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    min-width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import {mapState} from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'PriorityList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/priority/all",
+                downloading: false,
+                typeOptions: [{"label": "商户", "value": 0}, {"label": "商品", "value": 1}],
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            typeFormatter(row, column, cellValue, index) {
+                let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+                if (selectedOption) {
+                    return selectedOption.label;
+                }
+                return '';
+            },
+            beforeGetData() {
+                if (this.search) {
+                    return {search: this.search};
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/priorityEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/priorityEdit",
+                    query: {
+                        id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/priority/excel", {
+                        responseType: "blob",
+                        params: {size: 10000}
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/priority/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>