|
@@ -10,10 +10,13 @@ import com.chelvc.cloud.maintain.copier.MerchantCopier;
|
|
|
import com.chelvc.cloud.maintain.copier.ReservationCopier;
|
|
|
import com.chelvc.cloud.maintain.vo.ReservationVO;
|
|
|
import com.chelvc.cloud.vehicle.client.ReservationClient;
|
|
|
+import com.chelvc.cloud.vehicle.client.dto.MerchantReservationDTO;
|
|
|
import com.chelvc.cloud.vehicle.client.dto.ReservationDTO;
|
|
|
import com.chelvc.cloud.vehicle.client.param.ReservationModifyParam;
|
|
|
+import com.chelvc.cloud.vehicle.client.param.ReservationPagingParam;
|
|
|
import com.chelvc.cloud.vehicle.client.param.ReservationQueryParam;
|
|
|
import com.chelvc.framework.base.annotation.ResponseWrapping;
|
|
|
+import com.chelvc.framework.common.model.Pagination;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.util.CollectionUtils;
|
|
@@ -104,4 +107,16 @@ public class ReservationController {
|
|
|
return reservationVO;
|
|
|
}).collect(Collectors.toList());
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 商家端分页查询预约
|
|
|
+ *
|
|
|
+ * @param param 查询参数
|
|
|
+ * @return 预约分页信息
|
|
|
+ */
|
|
|
+ @GetMapping("/reservation/getMerchantList")
|
|
|
+ public Pagination<MerchantReservationDTO> getMerchantReservationPaging(@Valid ReservationPagingParam param) {
|
|
|
+ return this.reservationClient.getMerchantReservationPaging(param);
|
|
|
+ }
|
|
|
}
|