liude 1 год назад
Родитель
Сommit
54232ae29e

+ 7 - 4
src/main/java/com/chelvc/cloud/maintain/controller/HotMerchantController.java

@@ -2,6 +2,8 @@ package com.chelvc.cloud.maintain.controller;
 
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
 import com.chelvc.cloud.vehicle.api.param.HotMerchantModifyParam;
+import com.chelvc.cloud.vehicle.api.param.LocationQueryParam;
+import com.chelvc.cloud.vehicle.api.param.MerchantQueryParam;
 import com.chelvc.cloud.vehicle.api.service.HotMerchantService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -9,6 +11,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
@@ -44,8 +47,8 @@ public class HotMerchantController {
      * @param
      */
     @PostMapping("/listHotMerchant/")
-    public List<MerchantDTO> listHotMerchant() {
-       return this.hotMerchantService.listHotMerchant();
+    public List<MerchantDTO> listHotMerchant(@Valid @RequestBody LocationQueryParam param) {
+       return this.hotMerchantService.listHotMerchant(param);
     }
 
     /**
@@ -54,8 +57,8 @@ public class HotMerchantController {
      * @param
      */
     @PostMapping("/likeMerchant/")
-    public List<MerchantDTO> likeMerchant() {
-       return this.hotMerchantService.likeMerchant();
+    public List<MerchantDTO> likeMerchant(@Valid @RequestBody LocationQueryParam param) {
+       return this.hotMerchantService.likeMerchant(param);
     }
 
 

+ 9 - 0
src/main/java/com/chelvc/cloud/maintain/vo/ReservationVO.java

@@ -59,4 +59,13 @@ public class ReservationVO implements Serializable {
      * 简单商家信息
      */
     private SimpleMerchantVO simpleMerchantVO;
+
+    /**
+     * 商品id
+     */
+    private Long goodsId;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
 }