From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java
index eedaaca..8729cd7 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/ShopService.java
@@ -1,16 +1,19 @@
package com.ruoyi.other.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.vo.NearbyShopVO;
import com.ruoyi.other.vo.ShopDetailVO;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.RequestParam;
+import java.math.BigDecimal;
import java.util.List;
/**
* <p>
- * 服务类
+ * 服务类
* </p>
*
* @author luodangjia
@@ -18,7 +21,12 @@
*/
public interface ShopService extends IService<Shop> {
- List<NearbyShopVO> nearbyShopList(String longitude, String latitude);
+ IPage<Shop> getShopList(Integer PageNum, Integer pageSize, Shop shop);
- ShopDetailVO getShopDetail(Integer shopId,String longitude, String latitude);
+ List<NearbyShopVO> nearbyShopList(BigDecimal longitude, BigDecimal latitude);
+
+ ShopDetailVO getShopDetail(Integer shopId, BigDecimal longitude, BigDecimal latitude);
+
+ Boolean cheUserByPhone(String phone);
+
}
--
Gitblit v1.7.1