From 4ef310aeb73ea2207cad3832e368af3a87219c37 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:31 +0800
Subject: [PATCH] 合并代码
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/ConsumerGoodsService.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 012242b..cd88eed 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,15 +1,17 @@
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 com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import java.util.List;
@@ -45,7 +47,7 @@
void sureMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto);
/**
- * 确认商品次数
+ * 消费服务商品
* @param merSureConsumerGoodsDto
*/
void useMerConsumerGoods(MerSureConsumerGoodsDto merSureConsumerGoodsDto);
@@ -57,4 +59,32 @@
* @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);
+
+ /**
+ * @description 发放用户商品礼物
+ * @author jqs
+ * @date 2023/7/7 18:51
+ * @param giftSendDtoList
+ * @return void
+ */
+ void sendGoodsGift(List<BirthdayGiftSendDto> giftSendDtoList);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/7 19:34
+ * @param consumerGoodsList
+ * @return boolean
+ */
+ boolean saveBatchConsumerGoods(List<ConsumerGoods> consumerGoodsList);
}
--
Gitblit v1.7.1