From c2d38efe0c2516295abb968442ef765e3da9544d Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期二, 09 五月 2023 18:38:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java
index bceada6..012242b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java
@@ -2,9 +2,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.order.domain.dto.AppConsumerPageDto;
+import com.ruoyi.order.domain.dto.MerConsumerGoodsDto;
+import com.ruoyi.order.domain.dto.MerConsumerGoodsPageDto;
+import com.ruoyi.order.domain.dto.MerSureConsumerGoodsDto;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.domain.vo.AppConsumerPageVo;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
import java.util.List;
@@ -25,4 +30,31 @@
* @return
*/
List<AppConsumerPageVo> pageUserConsumerGoods(Page page, AppConsumerPageDto appConsumerPageDto);
+
+ /**
+ * 获取会员服务商品
+ * @param merConsumerGoodsDto
+ * @return
+ */
+ MerConsumerGoodsVo listMerConsumerGoods(MerConsumerGoodsDto merConsumerGoodsDto);
+
+ /**
+ * 确认商品次数
+ * @param merSureConsumerGoodsDto
+ */
+ void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto);
+
+ /**
+ * 确认商品次数
+ * @param merSureConsumerGoodsDto
+ */
+ void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto);
+
+ /**
+ *
+ * @param page
+ * @param merConsumerGoodsPageDto
+ * @return
+ */
+ List<MerConsumerGoodsListVo> pageMerConsumerGoodsNum(Page page, MerConsumerGoodsPageDto merConsumerGoodsPageDto);
}
--
Gitblit v1.7.1