订单

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

@@ -1,128 +0,0 @@
-package com.izouma.dingdong.dto;
-
-import com.izouma.dingdong.domain.OrderGoodsSpec;
-import com.izouma.dingdong.enums.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.*;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ApiModel(value = "订单表", description = "订单表")
-public class OrderDTO {
-
-    @ApiModelProperty(value = "用户昵称")
-    private String nickname;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "订单状态", name = "orderStatus")
-    private OrderStatus status;
-
-    //商家信息
-    @ApiModelProperty(value = "商户名称", name = "merchantShowName")
-    private String merchantShowName;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "商家状态", name = "merchantStatus")
-    private MerchantStatus merchantStatus;
-
-    @ApiModelProperty(value = "备注", name = "remark")
-    private String remark;
-
-    @ApiModelProperty(value = "包装价格", name = "packingPrice")
-    private BigDecimal packingPrice;
-
-    @ApiModelProperty(value = "配送费", name = "deliveryAmount")
-    private BigDecimal deliveryAmount;
-
-    @ApiModelProperty(value = "满减", name = "fullReduction")
-    private BigDecimal fullReduction;
-
-    @ApiModelProperty(value = "首单", name = "firstBuy")
-    private BigDecimal firstBuy;
-
-    @ApiModelProperty(value = "红包", name = "redBag")
-    private BigDecimal redBag;
-
-    @ApiModelProperty(value = "新用户", name = "newUser")
-    private BigDecimal newUser;
-
-    @ApiModelProperty(value = "总价", name = "totalAmount")
-    private BigDecimal totalAmount;
-
-//    @ApiModelProperty(value = "商品总价", name = "goodsAmount")
-//    private BigDecimal goodsAmount;
-
-    @ApiModelProperty(value = "实付金额", name = "realAmount")
-    private BigDecimal realAmount;
-
-    @ApiModelProperty(value = "优惠券ID", name = "couponId")
-    private Long userCouponId;
-
-
-    //配送信息
-    @ApiModelProperty(value = "骑手工号", name = "jobNumber")
-    private String jobNumber;
-
-    @ApiModelProperty(value = "骑手名称", name = "riderName")
-    private String riderName;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "骑手状态", name = "riderStatus")
-    private RiderStatus riderStatus;
-
-    //订单信息
-    private String orderNo;
-
-    @ApiModelProperty(value = "下单时间", name = "orderTime")
-    private LocalDateTime orderTime;
-
-    @ApiModelProperty(value = "配送地址", name = "userAddress")
-    private String userAddress;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "支付方式", name = "payMethod")
-    private PayMethod payMethod;
-
-    @Column(nullable = false)
-    @ApiModelProperty(value = "取消订单", name = "cancel")
-    private Boolean cancel = false;
-
-    @Column(nullable = false)
-    @ApiModelProperty(value = "已评价", name = "rated")
-    private Boolean rated = false;
-
-    @ApiModelProperty(value = "用户收到时间", name = "userReceivedTime")
-    private LocalDateTime userReceivedTime;
-
-    @Column(nullable = false)
-    private Boolean enabled = true;
-
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @JoinColumn(name = "orderInfoId")
-    List<OrderGoodsSpec> orderGoodsSpecs;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "取消订单原因", name = "reason")
-    private RefundReason reason;
-
-    @ApiModelProperty(value = "预计到达时间", name = "timeOfArrival")
-    private LocalDateTime timeOfArrival;
-
-    @ApiModelProperty(value = "期望送达时间段", name = "expectDeliveryTime")
-    private String expectDeliveryTime;
-
-    @ApiModelProperty(value = "评价ID", name = "appraisalId")
-    private Long appraisalId;
-
-}

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

@@ -1,6 +1,7 @@
 package com.izouma.dingdong.dto;
 
 import com.izouma.dingdong.domain.OrderGoodsSpec;
+import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,16 +14,14 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 @ApiModel(value = "订单表", description = "订单表")
-public class OrderInfoDTO {
+public class OrderInfoDTO extends OrderInfo {
 
-    private Long id;
+//    private Long id;
 
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "订单状态", name = "orderStatus")
-    private OrderStatus status;
+//    @Enumerated(EnumType.STRING)
+//    @ApiModelProperty(value = "订单状态", name = "orderStatus")
+//    private OrderStatus status;
 
     //商家信息
     @ApiModelProperty(value = "商家用户Id",name = "mUserId")
@@ -37,24 +36,24 @@ public class OrderInfoDTO {
     @ApiModelProperty(value = "商家地址", name = "merAddress")
     private String merAddress;
 
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "商家状态", name = "merchantStatus")
-    private MerchantStatus merchantStatus;
+//    @Enumerated(EnumType.STRING)
+//    @ApiModelProperty(value = "商家状态", name = "merchantStatus")
+//    private MerchantStatus merchantStatus;
 
 
     //用户信息
-    @ApiModelProperty(value = "用户Id",name = "userId")
-    private Long userId;
+//    @ApiModelProperty(value = "用户Id",name = "userId")
+//    private Long userId;
 
     @ApiModelProperty(value = "用户昵称")
     private String nickname;
 
-    //经度在前 纬度在后
-    @ApiModelProperty(value = "用户地址经纬度", name = "location")
-    private String location;
+//    //经度在前 纬度在后
+//    @ApiModelProperty(value = "用户地址经纬度", name = "location")
+//    private String location;
 
-    @ApiModelProperty(value = "配送地址", name = "userAddress")
-    private String userAddress;
+//    @ApiModelProperty(value = "配送地址", name = "userAddress")
+//    private String userAddress;
 
 
     //骑手信息
@@ -67,86 +66,83 @@ public class OrderInfoDTO {
     @ApiModelProperty(value = "骑手名称", name = "riderName")
     private String riderName;
 
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "骑手状态", name = "riderStatus")
-    private RiderStatus riderStatus;
+//    @Enumerated(EnumType.STRING)
+//    @ApiModelProperty(value = "骑手状态", name = "riderStatus")
+//    private RiderStatus riderStatus;
 
 
     //价格
-    @ApiModelProperty(value = "包装价格", name = "packingPrice")
-    private BigDecimal packingPrice;
-
-    @ApiModelProperty(value = "配送费", name = "deliveryAmount")
-    private BigDecimal deliveryAmount;
-
-    @ApiModelProperty(value = "满减", name = "fullReduction")
-    private BigDecimal fullReduction;
-
-    @ApiModelProperty(value = "首单", name = "firstBuy")
-    private BigDecimal firstBuy;
-
-    @ApiModelProperty(value = "红包", name = "redBag")
-    private BigDecimal redBag;
-
-    @ApiModelProperty(value = "新用户", name = "newUser")
-    private BigDecimal newUser;
-
-    @ApiModelProperty(value = "总价", name = "totalAmount")
-    private BigDecimal totalAmount;
+//    @ApiModelProperty(value = "包装价格", name = "packingPrice")
+//    private BigDecimal packingPrice;
+//
+//    @ApiModelProperty(value = "配送费", name = "deliveryAmount")
+//    private BigDecimal deliveryAmount;
+//
+//    @ApiModelProperty(value = "满减", name = "fullReduction")
+//    private BigDecimal fullReduction;
+//
+//    @ApiModelProperty(value = "首单", name = "firstBuy")
+//    private BigDecimal firstBuy;
+//
+//    @ApiModelProperty(value = "红包", name = "redBag")
+//    private BigDecimal redBag;
+//
+//    @ApiModelProperty(value = "新用户", name = "newUser")
+//    private BigDecimal newUser;
+//
+//    @ApiModelProperty(value = "总价", name = "totalAmount")
+//    private BigDecimal totalAmount;
 
 //    @ApiModelProperty(value = "商品总价", name = "goodsAmount")
 //    private BigDecimal goodsAmount;
 
-    @ApiModelProperty(value = "实付金额", name = "realAmount")
-    private BigDecimal realAmount;
-
-    @ApiModelProperty(value = "优惠券ID", name = "couponId")
-    private Long userCouponId;
+//    @ApiModelProperty(value = "实付金额", name = "realAmount")
+//    private BigDecimal realAmount;
+//
+//    @ApiModelProperty(value = "优惠券ID", name = "couponId")
+//    private Long userCouponId;
 
 
 
 
     //订单信息
-    @ApiModelProperty(value = "订单信息",name = "orderNo")
-    private String orderNo;
-
-    @ApiModelProperty(value = "下单时间", name = "orderTime")
-    private LocalDateTime orderTime;
-
-    @ApiModelProperty(value = "备注", name = "remark")
-    private String remark;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "支付方式", name = "payMethod")
-    private PayMethod payMethod;
-
-    @Column(nullable = false)
-    @ApiModelProperty(value = "取消订单", name = "cancel")
-    private Boolean cancel = false;
-
-    @Column(nullable = false)
-    @ApiModelProperty(value = "已评价", name = "rated")
-    private Boolean rated = false;
-
-    @ApiModelProperty(value = "用户收到时间", name = "userReceivedTime")
-    private LocalDateTime userReceivedTime;
-
-    @Column(nullable = false)
-    private Boolean enabled = true;
-
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @JoinColumn(name = "orderInfoId")
-    List<OrderGoodsSpec> orderGoodsSpecs;
-
-    @Enumerated(EnumType.STRING)
-    @ApiModelProperty(value = "取消订单原因", name = "reason")
-    private RefundReason reason;
-
-    @ApiModelProperty(value = "预计到达时间", name = "timeOfArrival")
-    private LocalDateTime timeOfArrival;
-
-    @ApiModelProperty(value = "期望送达时间段", name = "expectDeliveryTime")
-    private String expectDeliveryTime;
+//    @ApiModelProperty(value = "订单信息",name = "orderNo")
+//    private String orderNo;
+//
+//    @ApiModelProperty(value = "下单时间", name = "orderTime")
+//    private LocalDateTime orderTime;
+//
+//    @ApiModelProperty(value = "备注", name = "remark")
+//    private String remark;
+//
+//    @Enumerated(EnumType.STRING)
+//    @ApiModelProperty(value = "支付方式", name = "payMethod")
+//    private PayMethod payMethod;
+//
+//    @Column(nullable = false)
+//    @ApiModelProperty(value = "取消订单", name = "cancel")
+//    private Boolean cancel = false;
+//
+//    @Column(nullable = false)
+//    @ApiModelProperty(value = "已评价", name = "rated")
+//    private Boolean rated = false;
+//
+//    @ApiModelProperty(value = "用户收到时间", name = "userReceivedTime")
+//    private LocalDateTime userReceivedTime;
+
+//    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+//    @JoinColumn(name = "orderInfoId")
+//    List<OrderGoodsSpec> orderGoodsSpecs;
+
+//    @Enumerated(EnumType.STRING)
+//    @ApiModelProperty(value = "取消订单原因", name = "reason")
+//    private RefundReason reason;
+
+//    @ApiModelProperty(value = "预计到达时间", name = "timeOfArrival")
+//    private LocalDateTime timeOfArrival;
+//
+//    @ApiModelProperty(value = "期望送达时间段", name = "expectDeliveryTime")
+//    private String expectDeliveryTime;
 
     @ApiModelProperty(value = "评价ID", name = "appraisalId")
     private Long appraisalId;

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

@@ -2,14 +2,11 @@ package com.izouma.dingdong.service.user;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.izouma.dingdong.domain.merchant.Merchant;
 import com.izouma.dingdong.domain.user.Address;
 import com.izouma.dingdong.dto.AddressDTO;
-import com.izouma.dingdong.dto.MerchantDTO;
 import com.izouma.dingdong.repo.user.AddressRepo;
 import com.izouma.dingdong.utils.MapUtils;
 import lombok.AllArgsConstructor;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -59,18 +56,6 @@ public class AddressService {
         return result;
     }
 
-    public Map<T, Double> sortMap(Map<T, Double> map) {
-        //排序
-        List<Map.Entry<T, Double>> list = new ArrayList<>(map.entrySet());
-        list.sort(Comparator.comparing(Map.Entry<T, Double>::getValue));
-
-        Map<T, Double> result = new HashMap<>();
-        for (Map.Entry<T, Double> m : list) {
-            result.put(m.getKey(), m.getValue());
-        }
-        return result;
-    }
-
     /*
     转dto
      */

src/main/java/com/izouma/dingdong/web/OrderInfoController.java

@@ -92,7 +92,7 @@ public class OrderInfoController extends BaseController {
 
     @GetMapping("/my")
     @ApiOperation("个人订单")
-    public Page<OrderInfo> my(PageQuery pageQuery) {
+    public Page<OrderInfoDTO> my(PageQuery pageQuery) {
         //query.status 状态传入
         Map<String, Object> query = pageQuery.getQuery();
         Long id = SecurityUtils.getAuthenticatedUser().getId();
@@ -113,7 +113,8 @@ public class OrderInfoController extends BaseController {
                 query.put("riderId", riderId);
                 break;
         }
-        return orderInfoRepo.findAll(toSpecification(pageQuery, OrderInfo.class), toPageRequest(pageQuery));
+        return orderInfoRepo.findAll(toSpecification(pageQuery, OrderInfo.class), toPageRequest(pageQuery))
+                .map(orderInfoService::toDto);
 
 /*        List<OrderInfo> collect = orderInfoService.my(SecurityUtils.getAuthenticatedUser().getId());
         return new PageImpl<>(collect, toPageRequest(pageQuery), pageQuery.getSize());*/

src/main/vue/src/views/merchant/GoodsEdit.vue

@@ -2,56 +2,61 @@
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="66px" label-position="right" size="small"
                  style="max-width: 500px;">
-            <el-form-item prop="merchantId" label="商户ID">
-                <el-input type="number" v-model="formData.merchantId"></el-input>
-
+            <el-form-item prop="merchant.showName" label="商家">
+                <el-card class="rt-card" shadow="hover">{{formData.merchant.showName}}</el-card>
             </el-form-item>
             <el-form-item prop="name" label="名称">
-                <el-input v-model="formData.name"></el-input>
+                <el-card class="rt-card" shadow="hover">
+                    {{formData.name}}
+                </el-card>
+                <!--<el-input v-model="formData.name"></el-input>-->
             </el-form-item>
             <el-form-item prop="introduction" label="简介">
-                <el-input v-model="formData.introduction"></el-input>
+                <!--<el-input v-model="formData.introduction"></el-input>-->
+                <el-card class="rt-card" shadow="hover">
+                    {{formData.introduction}}
+                </el-card>
             </el-form-item>
             <el-form-item prop="img" label="图片">
-                <multi-upload v-model="formData.img"></multi-upload>
+                <!--<multi-upload v-model="formData.img"></multi-upload>-->
+                <el-image style="width: 50px; height: 50px"
+                          :src="picList(formData.img)[0]" fit="cover"
+                          :preview-src-list="picList(formData.img)?picList(formData.img):[]"></el-image>
             </el-form-item>
-            <el-form-item prop="inventory" label="库存">
-                <el-input-number type="number" v-model="formData.inventory"></el-input-number>
+            <!--<el-form-item prop="inventory" label="库存">
+                <el-input-number type="number" v-model="formData.inventory" disabled></el-input-number>
+            </el-form-item>-->
+            <el-form-item prop="totalSales" label="销量">
+               <!-- <el-input-number type="number" v-model="formData.totalSales" disabled> </el-input-number>-->
+                <el-card class="rt-card" shadow="hover">总销量 : {{formData.totalSales}} &nbsp;&nbsp; ( 库存 : {{formData.inventory}} )</el-card>
             </el-form-item>
-            <!--                <el-form-item prop="totalSales" label="总销量">
-                                        <el-input-number type="number" v-model="formData.totalSales"></el-input-number>
-                            </el-form-item>-->
             <!--                <el-form-item prop="daySales" label="日销售">
                                         <el-input-number type="number" v-model="formData.daySales"></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="likes" label="点赞">
+                <el-input-number type="number" v-model="formData.likes" disabled></el-input-number>
+            </el-form-item>
+            <el-form-item prop="bad" label="差评">
+                <el-input-number type="number" v-model="formData.bad" disabled></el-input-number>
+            </el-form-item>
             <el-form-item prop="amount" label="价格">
-                <el-input-number type="number" v-model="formData.amount"></el-input-number>
+                <el-input-number type="number" v-model="formData.amount" disabled></el-input-number>
             </el-form-item>
             <el-form-item prop="discountAmount" label="折扣">
-                <el-input-number type="number" v-model="formData.discountAmount"></el-input-number>
+                <el-input-number type="number" v-model="formData.discountAmount" disabled></el-input-number>
             </el-form-item>
             <el-form-item prop="signboard" label="招牌">
-                <el-switch v-model="formData.signboard"></el-switch>
+                <el-switch v-model="formData.signboard" disabled></el-switch>
+            </el-form-item>
+            <el-form-item prop="takeOff" label="下架">
+                <el-switch v-model="formData.takeOff" disabled></el-switch>
             </el-form-item>
-            <!--<el-form-item prop="takeOff" label="下架">
-                <el-switch v-model="formData.takeOff"></el-switch>
-            </el-form-item>-->
-<!--            <el-form-item prop="sort" label="排布">-->
-<!--                <el-input-number type="number" v-model="formData.sort"></el-input-number>-->
-<!--            </el-form-item>-->
             <el-form-item prop="isFullReduction" label="满减">
-                <el-switch v-model="formData.isFullReduction"></el-switch>
+                <el-switch v-model="formData.isFullReduction" disabled></el-switch>
             </el-form-item>
             <el-form-item prop="week" label="周几" id="week">
-                <el-select v-model="formData.week" multiple
+                <!--<el-select v-model="formData.week" multiple
                            placeholder="请选择" value-key="value">
-                    <!--<el-option v-for="item in weekOptions" :key="item.value"
-                               :label="item.label" :value="item">
-                    </el-option>-->
-<!--                    <el-option value="每天">每天</el-option>-->
                     <el-option value="MON">MON</el-option>
                     <el-option value="TUE">TUE</el-option>
                     <el-option value="WED">WED</el-option>
@@ -59,10 +64,11 @@
                     <el-option value="FRI">FRI</el-option>
                     <el-option value="SAT">SAT</el-option>
                     <el-option value="SUN">SUN</el-option>
-                </el-select>
+                </el-select>-->
+                <el-input type="textarea" disabled v-model="formData.week"></el-input>
             </el-form-item>
             <el-form-item prop="startTime" label="时间">
-                <el-time-picker
+                <el-time-picker disabled
                         v-model="formData.startTime"
                         value-format="HH:mm:ss"
                         placeholder="选择时间"
@@ -70,7 +76,7 @@
                 </el-time-picker>
             </el-form-item>
             <el-form-item prop="endTime" label="时间">
-                <el-time-picker
+                <el-time-picker disabled
                         v-model="formData.endTime"
                         value-format="HH:mm:ss"
                         placeholder="选择时间"
@@ -78,13 +84,13 @@
                 </el-time-picker>
             </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="saving"
+                <!--<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-button>-->
+                <el-button @click="$router.go(-1)">返回</el-button>
             </el-form-item>
         </el-form>
     </div>
@@ -108,11 +114,20 @@
         data() {
             return {
                 saving: false,
-                formData: {},
+                formData: {
+                    merchant: {},
+                },
                 rules: {},
             }
         },
         methods: {
+            picList(row) {
+                if (row) {
+                    return row.split(",");
+                } else {
+                    return "";
+                }
+            },
             onSave() {
                 this.$refs.form.validate((valid) => {
                     if (valid) {
@@ -154,11 +169,11 @@
                     }
                 })
             },
-            onChange(){
-              /*  let */
-            }
         }
     }
 </script>
 <style lang="less" scoped>
+    .rt-card /deep/ .el-card__body {
+        padding: 4px 15px !important;
+    }
 </style>

src/main/vue/src/views/merchant/GoodsList.vue

@@ -54,9 +54,6 @@
             </el-table-column>-->
             <el-table-column prop="totalSales" label="总销量"
             >
-                <!--                    </el-table-column>
-                                    <el-table-column prop="daySales" label="日销售"
-                >-->
             </el-table-column>
             <el-table-column prop="likes" label="点赞"
             >
@@ -79,9 +76,6 @@
                     <el-tag :type="row.takeOff?'':'info'">{{row.takeOff}}</el-tag>
                 </template>
             </el-table-column>
-            <!--            <el-table-column prop="sort" label="排布"
-                        >
-                        </el-table-column>-->
             <!--<el-table-column prop="isFullReduction" label="满减"
             >
                 <template slot-scope="{row}">
@@ -98,7 +92,7 @@
                     label="操作"
                     align="center"
                     fixed="right"
-                    min-width="150">
+                    min-width="240">
                 <template slot-scope="{row}">
                      <el-button @click="editRow(row)" type="primary" size="mini" plain>详情</el-button>
                     <el-button @click="take(row)" type="warning" size="mini" plain v-if="row.status === 'PASS'">