From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/ConsumerGoodsMapper.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 9ab8390..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,10 +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;
@@ -26,4 +30,36 @@
* @return
*/
List<AppConsumerPageVo> pageUserConsumerGoods(Page page, @Param("param") AppConsumerPageDto appConsumerPageDto);
+
+ /**
+ * 获取未确认服务商品
+ * @param merConsumerGoodsDto
+ * @return
+ */
+ List<MerConsumerGoodsListVo> listMerNoSureConsumerGoods(@Param("param") MerConsumerGoodsDto merConsumerGoodsDto);
+
+ /**
+ * 获取已确认服务商品
+ * @param merConsumerGoodsDto
+ * @return
+ */
+ List<MerConsumerGoodsListVo> listMerConsumerGoods(@Param("param") MerConsumerGoodsDto merConsumerGoodsDto);
+
+ /**
+ *
+ * @param page
+ * @param merConsumerGoodsPageDto
+ * @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