From 7a0dd449cc2f49c18c2bc324a3ed283b5f1b3cf5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 09 五月 2023 17:43:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
index 63b6a5e..0b6ef6c 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/goods/GoodsService.java
@@ -1,14 +1,13 @@
package com.ruoyi.order.service.goods;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.vo.AppGoodsInfoVo;
import com.ruoyi.order.domain.vo.AppSimpleActivityGoodsVo;
import com.ruoyi.order.domain.vo.AppSimpleGoodsVo;
-import com.ruoyi.order.domain.dto.AppGoodsInfoGetDto;
-import com.ruoyi.order.domain.dto.AppSearchGoodsPageDto;
-import com.ruoyi.order.domain.dto.AppShopGoodsPageDto;
import com.ruoyi.order.domain.pojo.goods.Goods;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.domain.vo.MerGoodsPageVo;
import java.util.List;
@@ -58,4 +57,17 @@
* @return
*/
AppGoodsInfoVo getGoodsInfo(AppGoodsInfoGetDto appGoodsInfoGetDto);
+
+ /**
+ * 分页商户商品列表
+ * @param merGoodsPageDto
+ * @return
+ */
+ List<MerGoodsPageVo> pageMerShopGoods(Page page,MerGoodsPageDto merGoodsPageDto);
+
+ /**
+ * 修改商户商品
+ * @param merShopGoodsEditDto
+ */
+ void editMerShopGoods(MerShopGoodsEditDto merShopGoodsEditDto);
}
--
Gitblit v1.7.1