设计优化，修改BUG

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/AssetClient.java

@@ -4,10 +4,11 @@ import com.chelvc.cloud.vehicle.client.dto.MerchantAssetDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient("vehicle")
 public interface AssetClient {
 
-    @GetMapping("/asset/merchant/{merchantId}")
-    MerchantAssetDTO getMerchantAsset(@PathVariable("merchantId") Long merchantId);
+    @GetMapping("/asset/merchant")
+    MerchantAssetDTO getMerchantAsset(@RequestParam("merchantId") Long merchantId);
 }

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/MerchantReservationDTO.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -41,6 +42,9 @@ public class MerchantReservationDTO implements Serializable {
      */
     private Long orderId;
 
+    /** 应付金额（实际支付金额） */
+    private BigDecimal payAmount;
+
     /**
      * 发起预约的时间
      */
@@ -49,4 +53,20 @@ public class MerchantReservationDTO implements Serializable {
      *购买的商品详细
      */
     private List<OrderItemDTO> goodItem;
+    /**
+     * 用户id
+     */
+    private Long userId;
+    /**
+     * 用户名称
+     */
+    private String username;
+    /**
+     * 用户头像
+     */
+    private String avatar;
+    /**
+     * 预约人手机号
+     */
+    private String phone;
 }

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDTO.java

@@ -147,19 +147,15 @@ public class OmsOrderDTO implements Serializable
     private Integer useIntegration;
 
     /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date paymentTime;
 
     /** 发货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date deliveryTime;
 
     /** 确认收货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveTime;
 
     /** 评价时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date commentTime;
     /**
      * 商家ID

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/AssetController.java

@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -14,8 +15,8 @@ public class AssetController {
 
     private final AssetService assetService;
 
-    @GetMapping("/asset/merchant/{merchantId}")
-    public MerchantAssetDTO getMerchantAsset(@PathVariable("merchantId") Long merchantId) {
+    @GetMapping("/asset/merchant")
+    public MerchantAssetDTO getMerchantAsset(@RequestParam("merchantId") Long merchantId) {
         return this.assetService.getMerchantAsset(merchantId);
     }
 }

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

@@ -143,19 +143,15 @@ public class OmsOrder extends ModifyEntity<Long>
     private Integer useIntegration;
 
     /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date paymentTime;
 
     /** 发货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date deliveryTime;
 
     /** 确认收货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date receiveTime;
 
     /** 评价时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date commentTime;
     /**
      * 商家ID

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/ReservationServiceImpl.java

@@ -177,6 +177,13 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
         }
         list.getRecords().forEach(item ->{
             item.setGoodItem(this.baseMapper.getReservationRetail(item.getOrderId()));
+
+            UserDTO userDTO = this.userService.getUser(item.getUserId());
+            if (!org.apache.commons.lang3.ObjectUtils.isEmpty(userDTO)){
+                item.setAvatar(userDTO.getAvatar());
+                item.setUsername(userDTO.getNickname());
+                item.setPhone(userDTO.getMobile());
+            }
         });
         return DatabaseContextHolder.pagination(list);
     }

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

@@ -30,7 +30,6 @@
         point(mt.longitude, mt.latitude), point(#{param.longitude}, #{param.latitude})
         )) distance from favorite fe
         inner join merchant mt on fe.content_id = mt.id and mt.status = 'ONLINE'
---         and mt.region between #{param.code} and #{param.boundary}
         where fe.user_id = #{userId} and fe.type = #{param.type}
         <if test="param.offset != null">
             and fe.id > #{param.offset}

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

@@ -93,7 +93,6 @@
         )) distance
         from `merchant` mt
         where mt.id = #{id}
---           and mt.region between #{param.code} and #{param.boundary}
     </select>
 
     <select id="merchantFavorite" resultType="java.lang.Integer">

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

@@ -33,7 +33,9 @@
         <result column="appoint_time" property="appointTime" jdbcType="TIMESTAMP"/>
         <result column="status" property="status" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result property="payAmount"    column="pay_amount"    />
         <result column="order_id" property="orderId" jdbcType="BIGINT"/>
+        <result column="user_id" property="userId" jdbcType="BIGINT"/>
         <association property="goodItem" javaType="com.chelvc.cloud.vehicle.client.dto.OrderItemDTO">
             <result column="goods_id" property="goodsId" jdbcType="BIGINT"/>
             <result column="goods_name" property="goodsName" jdbcType="VARCHAR"/>
@@ -71,6 +73,7 @@
         re.create_time,
         re.appoint_time,
         od.pay_amount,
+        re.user_id
         re.status
         FROM
         reservation re