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/mapper/order/ConsumerGoodsMapper.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ConsumerGoodsMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ConsumerGoodsMapper.java
index 4a4799a..9fd8b51 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ConsumerGoodsMapper.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ConsumerGoodsMapper.java
@@ -1,13 +1,14 @@
 package com.ruoyi.order.mapper.order;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.pojo.order.ConsumerGoods;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.order.domain.vo.AppConsumerPageVo;
 import com.ruoyi.order.domain.vo.MerConsumerGoodsListVo;
+import com.ruoyi.order.domain.vo.MerMemberConsumerGoodsTotalVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -51,4 +52,14 @@
      * @return
      */
     List<MerConsumerGoodsListVo> pageMerConsumerGoodsNum(Page page,@Param("param") MerConsumerGoodsPageDto merConsumerGoodsPageDto);
+
+    /**
+     * @description  获取用户在商户
+     * @author  jqs
+     * @date    2023/6/29 15:13
+     * @param userId
+     * @param shopId
+     * @return  MerMemberConsumerGoodsTotalVo
+     */
+    MerMemberConsumerGoodsTotalVo getMemberConsumerGoodsTotalVo(@Param("userId") Long userId,@Param("shopId") Long shopId);
 }

--
Gitblit v1.7.1