From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 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..731254b 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
@@ -1,10 +1,16 @@
package com.ruoyi.order.service.order;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.order.domain.dto.AppConsumerPageDto;
-import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.baomidou.mybatisplus.extension.service.IService;
+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.ruoyi.order.domain.vo.AppConsumerPageVo;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
+import com.ruoyi.order.domain.vo.MerConsumerGoodsVo;
+import com.ruoyi.order.domain.vo.MerMemberConsumerGoodsTotalVo;
import java.util.List;
@@ -25,4 +31,41 @@
* @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);
+
+ /**
+ * @description 获取用户在商户
+ * @author jqs
+ * @date 2023/6/29 15:13
+ * @param userId
+ * @param shopId
+ * @return MerMemberConsumerGoodsTotalVo
+ */
+ MerMemberConsumerGoodsTotalVo getMemberConsumerGoodsTotalVo(Long userId, Long shopId);
}
--
Gitblit v1.7.1