From 32bd52ec49d25021b6a35d8ee5f32c70df788165 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 05 七月 2023 21:30:21 +0800
Subject: [PATCH] bug 用户端

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 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 cb663a8..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,13 +1,16 @@
 package com.ruoyi.order.service.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.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 com.ruoyi.order.domain.vo.MerMemberConsumerGoodsTotalVo;
 
 import java.util.List;
 
@@ -47,4 +50,22 @@
      * @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