From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 7b7f93f..382d6ec 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.*;
@@ -111,7 +112,7 @@
* 添加会员
* @param merMemberAddDto
*/
- void addMerMember(MerMemberAddDto merMemberAddDto);
+ Long addMerMember(MerMemberAddDto merMemberAddDto);
/**
* 编辑会员
@@ -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 会员人数统计
@@ -323,13 +329,22 @@
List<MerOrderAgeUserVo> listOrderAgeUser(MerTotalDto merTotalDto);
/**
+ * @description 通过年龄层获取用户id列表
+ * @author jqs
+ * @date 2023/8/23 18:59
+ * @param ageType
+ * @return List<Long>
+ */
+ List<Long> listUserIdByAgeType(Integer ageType);
+
+ /**
* @description
* @author jqs
* @date 2023/7/5 21:18
- * @param mgtBaseGetDto
+ * @param mgtFrozenMemberDto
* @return void
*/
- void mgtFrozenMember(MgtBaseGetDto mgtBaseGetDto);
+ void mgtFrozenMember(MgtFrozenMemberDto mgtFrozenMemberDto);
/**
* @description 获取用户任务列表
@@ -357,4 +372,32 @@
* @return Integer
*/
Integer getAreaNewMember(List<Long> shopIdList);
+
+ /**
+ * @description 更新会员绑定商户名
+ * @author jqs
+ * @date 2023/7/26 17:08
+ * @param mgtMemberShopNameDto
+ * @return void
+ */
+ void updateMemberShopName(MgtMemberShopNameDto mgtMemberShopNameDto);
+
+ /**
+ * @param
+ * @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);
}
--
Gitblit v1.7.1