新增商家订单销量字段

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/MerchantDTO.java

@@ -1,11 +1,7 @@
 package com.chelvc.cloud.vehicle.api.dto;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 
-import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
-import com.chelvc.framework.base.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -27,11 +23,6 @@ public class MerchantDTO implements Serializable {
      */
     private Long id;
 
-    /**
-     * 用户ID
-     */
-    private Long userId;
-
     /**
      * 商家名称
      */
@@ -42,26 +33,6 @@ public class MerchantDTO implements Serializable {
      */
     private String logo;
 
-    /**
-     * 轮播图列表
-     */
-    private List<File> banners;
-
-    /**
-     * 联系人
-     */
-    private String liaison;
-
-    /**
-     * 联系电话
-     */
-    private String mobile;
-
-    /**
-     * 营业时间
-     */
-    private String opening;
-
     /**
      * 详细地址
      */
@@ -73,32 +44,12 @@ public class MerchantDTO implements Serializable {
     private Double score;
 
     /**
-     * 经度
-     */
-    private Double longitude;
-
-    /**
-     * 纬度
-     */
-    private Double latitude;
-
-    /**
-     * 是否推荐
-     */
-    private Boolean recommend;
-
-    /**
-     * 商家状态
-     */
-    private MerchantStatus status;
-
-    /**
-     * 创建用户
+     * 订单销量
      */
-    private Long creator;
+    private Integer sale;
 
     /**
-     * 创建时间
+     * 距离（米）
      */
-    private Date createTime;
+    private Integer distance;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/Merchant.java

@@ -83,6 +83,11 @@ public class Merchant extends ModifyEntity<Long> {
      */
     private Double score;
 
+    /**
+     * 订单销量
+     */
+    private Integer sale;
+
     /**
      * 经度
      */

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.chelvc.cloud.vehicle.server.dao.MerchantMapper">
     <sql id="BASIC_MERCHANT_SELECT">
         select mt.id, mt.user_id, mt.name, mt.logo, mt.banners, mt.liaison, mt.mobile, mt.opening, mt.address,
-        mt.score, mt.address, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
+        mt.score, mt.sale, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
         mt.updater, mt.update_time
         from `merchant` mt
     </sql>
 
     <select id="listRecommendMerchants" resultType="com.chelvc.cloud.vehicle.api.dto.MerchantDTO">
         select mt.id, mt.user_id, mt.name, mt.logo, mt.banners, mt.liaison, mt.mobile, mt.opening, mt.address,
-        mt.score, mt.address, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
+        mt.score, mt.sale, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
         mt.updater, mt.update_time,
         round(st_distance_sphere(
             point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
@@ -22,7 +22,7 @@
 
     <select id="listNearbyMerchants" resultType="com.chelvc.cloud.vehicle.api.dto.MerchantDTO">
         select mt.id, mt.user_id, mt.name, mt.logo, mt.banners, mt.liaison, mt.mobile, mt.opening, mt.address,
-        mt.score, mt.address, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
+        mt.score, mt.sale, mt.longitude, mt.latitude, mt.recommend, mt.status, mt.creator, mt.create_time,
         mt.updater, mt.update_time, t.distance
         from `merchant` mt
         inner join (