From 985e48474a3decdcab3d5d99dc0b5211b381c2a6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 09:19:45 +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 |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 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 05932d0..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.*;
@@ -380,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