From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java
index 60fe644..75cba41 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppGiftServiceImpl.java
@@ -1,6 +1,8 @@
 package com.dsh.account.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.dto.IntroduceUserQuery;
+import com.dsh.account.entity.IntroduceUser;
 import com.dsh.account.entity.TAppGift;
 import com.dsh.account.feignclient.course.CourseListClient;
 import com.dsh.account.feignclient.course.CoursePaymentClient;
@@ -9,6 +11,8 @@
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,10 +26,17 @@
 public class TAppGiftServiceImpl extends ServiceImpl<TAppGiftMapper, TAppGift> implements TAppGiftService {
     @Autowired
     private CoursePaymentClient coursePaymentClient;
+    @Autowired
+    private TAppGiftMapper mapper;
 
     @Override
-    public Boolean weeksOfAddHours(Integer packetId,Integer appUserId,Integer num) {
-        Boolean b = coursePaymentClient.sendHours(packetId+"_"+appUserId+"_"+num);
+    public Integer weeksOfAddHours(Long packetId, Integer appUserId, Integer num) {
+        Integer b = coursePaymentClient.sendHours(packetId + "_" + appUserId + "_" + num);
         return b;
     }
+
+    @Override
+    public List<IntroduceUser> queryIntroduceAll(IntroduceUserQuery query) {
+        return mapper.queryIntroduceAll(query);
+    }
 }

--
Gitblit v1.7.1