商品的显示/评价/规格

商户加配送费设置和每餐准备时间
订单添加预计到达时间

src/main/java/com/izouma/dingdong/domain/OrderInfo.java

@@ -145,4 +145,7 @@ public class OrderInfo extends BaseEntity {
 
     @ApiModelProperty(value = "取消订单原因", name = "reason")
     private String reason;
+
+    @ApiModelProperty(value = "预计到达时间")
+    private LocalDateTime timeOfArrival;
 }

src/main/java/com/izouma/dingdong/domain/merchant/MerchantSettings.java

@@ -44,22 +44,21 @@ public class MerchantSettings extends BaseEntity {
     @ApiModelProperty(value = "横幅", name = "banner")
     private String banner;
 
-    @ApiModelProperty(value = "公告",name = "proclamation")
+    @ApiModelProperty(value = "公告", name = "proclamation")
     private String proclamation;
 
     @ApiModelProperty(value = "简介", name = "introduction")
     private String introduction;
 
-    @ApiModelProperty(value = "首单优惠需求")
-    private String demand;
-
     @Column(precision = 10, scale = 2)
     @ApiModelProperty(value = "首单优惠", name = "firstOrder")
     private BigDecimal firstOrder;
 
+/*
     @Column(precision = 10, scale = 2)
     @ApiModelProperty(value = "新用户优惠", name = "newUser")
     private BigDecimal newUser;
+*/
 
     @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
     @JoinTable(
@@ -94,17 +93,25 @@ public class MerchantSettings extends BaseEntity {
     @ApiModelProperty(value = "商家性质", name = "merchantNatureId")
     private Long merchantNatureId;
 
+    @Column(nullable = false)
     @Builder.Default
     private Boolean enabled = true;
 
     @ApiModelProperty(value = "自动接单", name = "automaticOrder")
-    private Boolean automaticOrder;
+    private Boolean automaticOrder = false;
 
     @ApiModelProperty(value = "是否营业中", name = "isOpening")
     private Boolean isOpening;
 
-    @ManyToOne(fetch = FetchType.LAZY,cascade = CascadeType.DETACH)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.DETACH)
     @JoinColumn(name = "merchantNatureId", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     private MerchantNature merchantNature;
 
+    @Column(precision = 10, scale = 2)
+    @ApiModelProperty(value = "起送金额")
+    private BigDecimal startingAmount;
+
+    @ApiModelProperty(value = "每餐准备时间")
+    private Long preparationTime;
+
 }

src/main/java/com/izouma/dingdong/dto/MerchantDTO.java

@@ -38,7 +38,7 @@ public class MerchantDTO {
         img = merchantSettings.getImg();
         introduction = merchantSettings.getIntroduction();
         name = merchant.getName();
-        newUser = merchantSettings.getNewUser();
+        /*    newUser = merchantSettings.getNewUser();*/
         phone = merchant.getPhone();
         qualification = merchantSettings.getQualification();
         showName = merchant.getShowName();
@@ -53,7 +53,8 @@ public class MerchantDTO {
         proclamation = merchantSettings.getProclamation();
         userId = merchant.getUserId();
         merchantNature = merchantSettings.getMerchantNature();
-        demand = merchantSettings.getDemand();
+        startingAmount = merchantSettings.getStartingAmount();
+        preparationTime = merchantSettings.getPreparationTime();
     }
 
 
@@ -107,19 +108,16 @@ public class MerchantDTO {
     @ApiModelProperty(value = "首单优惠", name = "firstOrder")
     private BigDecimal firstOrder;
 
+/*
     @ApiModelProperty(value = "新用户优惠", name = "newUser")
     private BigDecimal newUser;
+*/
 
     @BatchSize(size = 20)
     @ApiModelProperty(value = "经营品类", name = "category")
     private Set<Category> category;
 
-/*    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.DETACH})
-    @JoinTable(
-            name = "mer_tag",
-            joinColumns = {@JoinColumn(name = "mer_id", referencedColumnName = "id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))},
-            inverseJoinColumns = {@JoinColumn(name = "tag_name", referencedColumnName = "name", foreignKey = @ForeignKey(name = "none", value = ConstraintMode.NO_CONSTRAINT))})
-    @BatchSize(size = 20)
+/*
     @ApiModelProperty(value = "标签", name = "tag")
     private Set<Tag> tag;*/
 
@@ -156,7 +154,13 @@ public class MerchantDTO {
 
     private MerchantNature merchantNature;
 
-    @ApiModelProperty(value = "首单优惠需求")
-    private String demand;
+//    @ApiModelProperty(value = "首单优惠需求")
+//    private String demand;
+
+    @ApiModelProperty(value = "起送金额")
+    private BigDecimal startingAmount;
+
+    @ApiModelProperty(value = "每餐准备时间")
+    private String preparationTime;
 
 }

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

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

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -31,6 +31,7 @@ import com.izouma.dingdong.service.merchant.SalesService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -82,6 +83,14 @@ public class OrderInfoService {
             throw new BusinessException("非营业时间");
         }
 
+        //如果未设置起送金额为0
+        if (ObjectUtil.isEmpty(merchantSettings.getStartingAmount())){
+            merchantSettings.setStartingAmount(BigDecimal.ZERO);
+        }
+        if (merchantSettings.getStartingAmount().compareTo(cart.getGoodsTotal()) > 0){
+            throw new BusinessException("未达到起送金额");
+        }
+
         OrderInfo orderInfo = new OrderInfo();
         BeanUtil.copyProperties(userOrderDTO, orderInfo);
         BeanUtil.copyProperties(cart, orderInfo);
@@ -90,6 +99,13 @@ public class OrderInfoService {
         orderInfo.setOrderTime(now);
         orderInfo.setEnabled(true);
 
+        //如果未设置预计到达为30分钟
+        if (ObjectUtil.isEmpty(merchantSettings.getPreparationTime())){
+            merchantSettings.setPreparationTime(30L);
+        }
+        //预计送达时间
+        orderInfo.setTimeOfArrival(LocalDateTime.now().plusMinutes(merchantSettings.getPreparationTime()));
+
         //用户地址
         Address address = addressRepo.findById(userOrderDTO.getAddressId()).orElseThrow(new BusinessException("地址不存在"));
         //orderInfo.setUserAddress(address.getAddressName());

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

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service.backstage;
+
+import com.izouma.dingdong.domain.backstage.Complaint;
+import com.izouma.dingdong.repo.backstage.ComplaintRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ComplaintService {
+
+    private ComplaintRepo complaintRepo;
+
+}

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

@@ -5,22 +5,21 @@ import com.izouma.dingdong.config.Constants;
 import com.izouma.dingdong.converter.LongArrayConverter;
 import com.izouma.dingdong.converter.StringArrayConverter;
 import com.izouma.dingdong.domain.backstage.Email;
-import com.izouma.dingdong.domain.merchant.Goods;
-import com.izouma.dingdong.domain.merchant.Merchant;
-import com.izouma.dingdong.domain.merchant.MerchantClassification;
-import com.izouma.dingdong.domain.merchant.MerchantSettings;
+import com.izouma.dingdong.domain.merchant.*;
+import com.izouma.dingdong.dto.AppraisalMerDTO;
 import com.izouma.dingdong.enums.ApplyStatus;
 import com.izouma.dingdong.exception.BusinessException;
-import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.backstage.EmailRepo;
 import com.izouma.dingdong.repo.merchant.*;
+import com.izouma.dingdong.service.AppraisalService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 @Service
@@ -29,12 +28,12 @@ public class GoodsService {
 
     private GoodsRepo goodsRepo;
     private MerchantSettingsRepo merchantSettingsRepo;
-    private MerchantService merchantService;
-    private SalesRepo salesRepo;
     private MerchantClassificationRepo merchantClassificationRepo;
     private MerchantClassificationService merchantClassificationService;
     private EmailRepo emailRepo;
     private MerchantRepo merchantRepo;
+    private AppraisalService appraisalService;
+    private GoodsSpecificationRepo goodsSpecificationRepo;
 
     /**
      * 添加修改商品
@@ -206,7 +205,6 @@ public class GoodsService {
     */
     public Boolean containsWeek(String goodsWeek, String merWeek) {
 
-
         List<String> merWeeks = new StringArrayConverter().convertToEntityAttribute(merWeek);
         List<String> goodsWeeks = new StringArrayConverter().convertToEntityAttribute(goodsWeek);
 
@@ -219,8 +217,24 @@ public class GoodsService {
                 return false;
             }
         }
-
         return true;
 
     }
+
+    /*
+    显示商品所有信息
+     */
+    public Map<String,Object> goodsAllInfo(Long goodsId){
+        HashMap<String, Object> map = new HashMap<>();
+        Goods goods = goodsRepo.findById(goodsId).orElseThrow(new BusinessException("无记录"));
+        map.put("goods",goods);
+
+        List<AppraisalMerDTO> appraisals = appraisalService.goodsAppraisals(goodsId);
+        map.put("appraisal",appraisals);
+
+        List<GoodsSpecification> specifications = goodsSpecificationRepo.findAllByGoodsId(goodsId);
+        map.put("specification",specifications);
+
+        return map;
+    }
 }

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

@@ -4,35 +4,26 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.config.Constants;
-import com.izouma.dingdong.domain.BankCard;
 import com.izouma.dingdong.domain.User;
 import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.merchant.MerchantClassification;
 import com.izouma.dingdong.domain.merchant.MerchantSettings;
 import com.izouma.dingdong.dto.MerchantDTO;
 import com.izouma.dingdong.enums.ApplyStatus;
-import com.izouma.dingdong.enums.Identity;
 import com.izouma.dingdong.exception.BusinessException;
-import com.izouma.dingdong.repo.BankCardRepo;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.merchant.MerchantClassificationRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.repo.merchant.MerchantSettingsRepo;
-import com.izouma.dingdong.security.Authority;
-import com.izouma.dingdong.service.UserService;
 import com.izouma.dingdong.utils.ObjUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -47,11 +38,6 @@ public class MerchantService {
 
     private MerchantClassificationRepo merchantClassificationRepo;
 
-    private UserService userService;
-
-    private BankCardRepo bankCardRepo;
-
-
     /*
     商户注册申请
      */
@@ -105,9 +91,9 @@ public class MerchantService {
         merchantSettings.setAutomaticOrder(false);
 
         //新用户和首单金额未设置时
-        if (ObjectUtil.isNull(merchantDTO.getNewUser())) {
+/*        if (ObjectUtil.isNull(merchantDTO.getNewUser())) {
             merchantSettings.setNewUser(BigDecimal.ZERO);
-        }
+        }*/
         if (ObjectUtil.isNull(merchantDTO.getFirstOrder())) {
             merchantSettings.setFirstOrder(BigDecimal.ZERO);
         }

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

@@ -99,7 +99,7 @@ public class ShoppingCartService {
         List<OrderInfo> userOrdersMerchant = orderInfoRepo.findAllByUserIdAndMerchantId(userId, merchantId);
         //是新用户也是首单
         if (CollUtil.isEmpty(userOrders)) {
-            shoppingCart.setNewUser(merchant.getNewUser());
+//            shoppingCart.setNewUser(merchant.getNewUser());
             shoppingCart.setFirstBuy(merchant.getFirstOrder());
         } else {
             //首单

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

@@ -0,0 +1,65 @@
+package com.izouma.dingdong.web.backstage;
+
+import com.izouma.dingdong.web.BaseController;
+import com.izouma.dingdong.domain.backstage.Complaint;
+import com.izouma.dingdong.service.backstage.ComplaintService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.backstage.ComplaintRepo;
+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("/complaint")
+@AllArgsConstructor
+public class ComplaintController extends BaseController {
+    private ComplaintService complaintService;
+    private ComplaintRepo complaintRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Complaint save(@RequestBody Complaint record) {
+        if (record.getId() != null) {
+            Complaint orig = complaintRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return complaintRepo.save(orig);
+        }
+        return complaintRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<Complaint> all(PageQuery pageQuery) {
+        return complaintRepo.findAll(toSpecification(pageQuery,Complaint.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public Complaint get(@PathVariable Long id) {
+        return complaintRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        complaintRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Complaint> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+
+
+}
+

src/main/java/com/izouma/dingdong/web/merchant/GoodsController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/goods")
@@ -91,5 +92,11 @@ public class GoodsController extends BaseController {
     public Goods audit(Long id, Boolean pass, String reason) {
         return goodsService.audit(id, pass, reason);
     }
+
+    @GetMapping("/getInfo/{id}")
+    @ApiOperation("商品信息/商品规格/商品评价")
+    public Map<String, Object> getInfo(@PathVariable Long id) {
+        return goodsService.goodsAllInfo(id);
+    }
 }
 

src/main/resources/genjson/Complaint.json

@@ -0,0 +1 @@
+{"tableName":"Complaint","className":"Complaint","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":"orderId","modelName":"orderId","remark":"订单ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"target","modelName":"target","remark":"投诉目标","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"type","modelName":"type","remark":"投诉类型","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"img","modelName":"img","remark":"图片","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"content","modelName":"content","remark":"内容","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"resolve","modelName":"resolve","remark":"是否解决","showInList":true,"showInForm":true,"formType":"switch"},{"name":"time","modelName":"time","remark":"投诉时间","showInList":true,"showInForm":true,"formType":"datetime"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.backstage.Complaint","genPackage":"backstage"}

src/main/vue/src/router.js

@@ -302,6 +302,22 @@ const router = new Router({
                     meta: {
                        title: '聊天框话术',
                     },
+               },
+                {
+                    path: '/complaintEdit',
+                    name: 'ComplaintEdit',
+                    component: () => import(/* webpackChunkName: "complaintEdit" */ '@/views/ComplaintEdit.vue'),
+                    meta: {
+                       title: '投诉编辑',
+                    },
+                },
+                {
+                    path: '/complaintList',
+                    name: 'ComplaintList',
+                    component: () => import(/* webpackChunkName: "complaintList" */ '@/views/ComplaintList.vue'),
+                    meta: {
+                       title: '投诉',
+                    },
                }
                 /**INSERT_LOCATION**/,
                 {
@@ -360,14 +376,6 @@ const router = new Router({
                         title: '退款申请',
                     },
                 },
-/*                {
-                    path: '/userOrderList',
-                    name: 'UserOrderList',
-                    component: () => import(/!* webpackChunkName: "userOrderList" *!/ '@/views/UserOrderList.vue'),
-                    meta: {
-                        title: '用户订单',
-                    },
-                },*/
             ],
         },
         {

src/main/vue/src/views/Categories.vue

@@ -352,7 +352,7 @@
 
     .custom-tree-node:hover {
         .opt {
-            opacity: 1;
+            opacity: 0;
         }
     }
 

src/main/vue/src/views/ComplaintEdit.vue

@@ -0,0 +1,111 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="orderId" label="订单ID">
+                            <el-input-number type="number" v-model="formData.orderId"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="target" label="投诉目标">
+                            <el-input v-model="formData.target"></el-input>
+                </el-form-item>
+                <el-form-item prop="type" label="投诉类型">
+                            <el-input v-model="formData.type"></el-input>
+                </el-form-item>
+                <el-form-item prop="img" label="图片">
+                            <el-input v-model="formData.img"></el-input>
+                </el-form-item>
+                <el-form-item prop="content" label="内容">
+                            <el-input v-model="formData.content"></el-input>
+                </el-form-item>
+                <el-form-item prop="resolve" label="是否解决">
+                            <el-switch v-model="formData.resolve"></el-switch>
+                </el-form-item>
+                <el-form-item prop="time" label="投诉时间">
+                            <el-date-picker
+                                    v-model="formData.time"
+                                    type="datetime"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
+                                    placeholder="选择日期时间">
+                            </el-date-picker>
+                </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: 'ComplaintEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('complaint/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: {
+                },
+            }
+        },
+        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('/complaint/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(`/complaint/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/ComplaintList.vue

@@ -0,0 +1,186 @@
+<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>
+            <el-button @click="download" type="primary" icon="el-icon-download"
+                       :loading="downloading" class="filter-item">导出EXCEL
+            </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="orderId" label="订单ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="target" label="投诉目标"
+>
+                    </el-table-column>
+                    <el-table-column prop="type" label="投诉类型"
+>
+                    </el-table-column>
+                    <el-table-column prop="img" label="图片"
+>
+                    </el-table-column>
+                    <el-table-column prop="content" label="内容"
+>
+                    </el-table-column>
+                    <el-table-column prop="resolve" label="是否解决"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.resolve?'':'info'">{{row.resolve}}</el-tag>
+                            </template>
+                    </el-table-column>
+                    <el-table-column prop="time" label="投诉时间"
+                            :formatter="datetimeFormatter"
+>
+                    </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: 'ComplaintList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/complaint/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/complaintEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/complaintEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/complaint/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(`/complaint/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>

src/main/vue/src/views/UserEdit.vue

@@ -80,10 +80,10 @@
                 :visible.sync="dislogTableOrder"
         >
             <el-table :data="orders" ref="table">
-                <el-table-column prop="remark" label="备注"></el-table-column>
-                <el-table-column prop="merchantId" label="商家"></el-table-column>
+                <el-table-column prop="merchant.showName" label="商家"></el-table-column>
                 <el-table-column prop="riderId" label="骑手"></el-table-column>
                 <el-table-column prop="realAmount" label="实付金额"></el-table-column>
+                <el-table-column prop="remark" label="备注"></el-table-column>
             </el-table>
             <div class="pagination-wrapper">
 <!--                <el-button @click="operation1">确定</el-button>-->

src/main/vue/src/views/UserOrderList.vue

@@ -1,235 +0,0 @@
-<template>
-  <div class="edit-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>
-                    <el-button @click="download" type="primary" icon="el-icon-download"
-                               :loading="downloading" class="filter-item">导出EXCEL
-                    </el-button>
-    </div>-->
-    <el-table
-      :data="formData"
-      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 prop="id" label="ID" width="100"></el-table-column>
-      <el-table-column prop="userId" label="用户ID"></el-table-column>
-      <el-table-column prop="userAddress" label="配送地址"></el-table-column>
-      <el-table-column prop="merchantId" label="商户ID"></el-table-column>
-      <el-table-column prop="merchantStatus" label="商家状态"></el-table-column>
-      <el-table-column prop="jobNumber" label="骑手工号"></el-table-column>
-      <el-table-column prop="riderStatus" label="骑手状态" :formatter="riderStatusFormatter"></el-table-column>
-      <el-table-column prop="goodsAmount" label="商品总价"></el-table-column>
-      <el-table-column prop="deliveryAmount" label="配送费"></el-table-column>
-      <el-table-column prop="realAmount" label="实付金额"></el-table-column>
-      <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"></el-table-column>
-      <el-table-column prop="cancel" label="取消订单">
-        <template slot-scope="{row}">
-          <el-tag :type="row.cancel?'':'info'">{{row.cancel}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="rated" label="已评价">
-        <template slot-scope="{row}">
-          <el-tag :type="row.rated?'':'info'">{{row.rated}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderTime" label="下单时间" :formatter="datetimeFormatter"></el-table-column>
-      <!--                    <el-table-column prop="merchantOrderTime" label="商家接单时间"
-                                        :formatter="datetimeFormatter"
-            >
-                                </el-table-column>
-                                <el-table-column prop="riderOrderTime" label="骑手接单时间"
-                                        :formatter="datetimeFormatter"
-            >
-      </el-table-column>-->
-      <el-table-column prop="userReceivedTime" label="用户收到时间" :formatter="datetimeFormatter"></el-table-column>
-      <!--                    <el-table-column prop="isCoupon" label="使用优惠券"
-            >
-                                        <template slot-scope="{row}">
-                                            <el-tag :type="row.isCoupon?'false':'info'">{{row.isCoupon}}</el-tag>
-                                        </template>
-      </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>-->
-          <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--        <div class="pagination-wrapper">
-                    <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: "UserOrderList",
-  props: ["id"],
-  //mixins: [pageableTable],
-  created() {
-    this.getData();
-  },
-  mounted() {
-    this.tableHeight = document
-      .querySelector(".el-table")
-      .getBoundingClientRect().height;
-  },
-  data() {
-    return {
-      multipleMode: false,
-      //search: "",
-      downloading: false,
-      formData: {},
-      riderStatusOptions: [
-        { label: "接单", value: "RECEIVED" },
-        {
-          label: "取餐",
-          value: "TAKE_MEAL"
-        },
-        { label: "送餐", value: "MEAL_DELIVERY" },
-        { label: "完成", value: "CARRY_OUT" }
-      ],
-      payMethodOptions: [
-        { label: "支付宝", value: "ALI_PAY" },
-        {
-          label: "货到付款",
-          value: "CASH_DELIVERY"
-        },
-        { label: "信用卡", value: "CREDIT_CARD" }
-      ]
-    };
-  },
-  computed: {
-    selection() {
-      return this.$refs.table.selection.map(i => i.id);
-    }
-  },
-  methods: {
-    riderStatusFormatter(row, column, cellValue, index) {
-      let selectedOption = this.riderStatusOptions.find(
-        i => i.value === cellValue
-      );
-      if (selectedOption) {
-        return selectedOption.label;
-      }
-      return "";
-    },
-    payMethodFormatter(row, column, cellValue, index) {
-      let selectedOption = this.payMethodOptions.find(
-        i => i.value === cellValue
-      );
-      if (selectedOption) {
-        return selectedOption.label;
-      }
-      return "";
-    },
-    // beforeGetData() {
-    //     if (this.search) {
-    //         return {search: this.search};
-    //     }
-    // },
-
-    getData() {
-      let data = {};
-      this.$http.get("/orderInfo/list", data).then(res => {
-        this.id = res.id;
-      });
-    },
-
-    toggleMultipleMode(multipleMode) {
-      this.multipleMode = multipleMode;
-      if (!multipleMode) {
-        this.$refs.table.clearSelection();
-      }
-    },
-    // addRow() {
-    //     this.$router.push({
-    //         path: "/orderInfoEdit",
-    //         query: {
-    //             ...this.$route.query
-    //         }
-    //     });
-    // },
-    // editRow(row) {
-    //     this.$router.push({
-    //         path: "/orderInfoEdit",
-    //         query: {
-    //             id: row.id
-    //         }
-    //     });
-    // },
-    download() {
-      this.downloading = true;
-      this.$axios
-        .get("/orderInfo/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(`/orderInfo/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>

src/test/java/com/izouma/dingdong/service/GoodsServiceTest.java

@@ -0,0 +1,54 @@
+package com.izouma.dingdong.service;
+
+import com.izouma.dingdong.domain.merchant.Goods;
+import com.izouma.dingdong.domain.merchant.GoodsSpecification;
+import com.izouma.dingdong.domain.merchant.MerchantClassification;
+import com.izouma.dingdong.dto.AppraisalMerDTO;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.merchant.GoodsRepo;
+import com.izouma.dingdong.repo.merchant.GoodsSpecificationRepo;
+import com.izouma.dingdong.service.merchant.GoodsService;
+import com.izouma.dingdong.utils.SecurityUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class GoodsServiceTest {
+
+    @Autowired
+    private AppraisalService appraisalService;
+
+    @Autowired
+    private GoodsRepo goodsRepo;
+
+    @Autowired
+    private GoodsSpecificationRepo goodsSpecificationRepo;
+
+    @Test
+    public void testApp(){
+        System.out.println(appraisalService.goodsAppraisals(214L));
+    }
+
+    @Test
+    public void showGoods(){
+        HashMap<String, Object> map = new HashMap<>();
+        Goods goods = goodsRepo.findById(214L).orElseThrow(new BusinessException("无记录"));
+        map.put("goods",goods);
+
+        List<AppraisalMerDTO> appraisals = appraisalService.goodsAppraisals(214L);
+        map.put("appraisal",appraisals);
+
+        List<GoodsSpecification> specifications = goodsSpecificationRepo.findAllByGoodsId(214L);
+        map.put("specification",specifications);
+
+        System.out.println(map);
+    }
+}