From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 七月 2025 16:41:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
index bc6985c..21168c3 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.domain.dto.*;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.system.api.domain.dto.*;
@@ -195,6 +196,11 @@
*/
List<Long> listIdBySendType(Integer sendType,Long shopId);
+
+ List<Long> listIdBySendType2(Long shopId);
+
+
+
/**
* @description 通过ids获取用户简易返回
* @author jqs
@@ -220,7 +226,7 @@
* @author jqs34
* @date 2023/6/18 16:47
*/
- MgtBulletinBoardVo boardMemberTotal();
+ MgtBulletinBoardVo boardMemberTotal(List<Long> shopIds);
/**
* @description 会员人数统计
@@ -375,13 +381,28 @@
* @return void
*/
void updateMemberShopName(MgtMemberShopNameDto mgtMemberShopNameDto);
-
+
/**
- * @description 发送生日祝福
- * @author jqs
- * @date 2023/8/7 15:40
* @param
- * @return void
+ * @return void
+ * @description 发送生日祝福
+ * @author jqs
+ * @date 2023/8/7 15:40
*/
void sendBirthdayBless();
+
+
+ /**
+ * 手动添加用户积分
+ *
+ * @param integral
+ * @param userId
+ * @return
+ */
+ R addIntegralRecord(Integer integral, Long userId, String orderId);
+
+ /**
+ * 获取微信二维码
+ */
+ String getWeiXinQrCode(String scene, String path);
}
--
Gitblit v1.7.1