From e38dbee7e43f6af65c7e9307d936a1c48e4bb539 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
index d33e0d5..3d2b3e2 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java
@@ -1,6 +1,9 @@
 package com.ruoyi.other.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.other.api.domain.Goods;
 import com.ruoyi.other.vo.GoodsVO;
 
@@ -16,9 +19,17 @@
  */
 public interface GoodsService extends IService<Goods> {
 
-    List<GoodsVO> goodsList(Goods goods);
+    PageInfo<GoodsVO> goodsList(Goods goods);
 
-    GoodsVO goodsDetail(Long goodsId);
+    GoodsVO goodsDetail(Long goodsId, String longitude, String latitude);
 
-    List<Goods> getGoodsListByShopId(Integer shopId);
+    List<Goods> getGoodsListByShopId(PageInfo<Goods> pageInfo, Integer shopId);
+
+    void addGoods(Goods goods);
+
+    void updateManageGoods(Goods goods);
+
+    IPage<Goods> getManageGoodsList(Page<Goods> page, Goods goods);
+
+    Goods getManageGoodsDetail(Long goodsId);
 }

--
Gitblit v1.7.1