From d0871f4f1ce14c6b74ef8378fd41067cdd213b1a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Apr 2024 00:26:09 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 34088f0..e0f0806 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -7,6 +7,7 @@
import cc.mrbird.febs.mall.entity.MallMemberPayment;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.vip.service.IMallVipBenefitsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -17,6 +18,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Map;
/**
* @author wzy
@@ -33,6 +35,7 @@
private final IMallMemberWithdrawService mallMemberWithdrawService;
private final IApiMallMemberWalletService walletService;
private final IApiMallAgentService iApiMallAgentService;
+ private final IMallVipBenefitsService mallVipBenefitsService;
/**
* 小程序接收用户数据，更新用户信息
@@ -273,6 +276,9 @@
@ApiOperation(value = "登录事件", notes = "登录事件")
@GetMapping(value = "/loginEvent")
public FebsResponse loginEvent() {
- return new FebsResponse().success().data(memberService.loginEvent());
+ Map<String, Object> birthdayEvent = mallVipBenefitsService.birthdayEvent();
+ Map<String, Object> loginEvent = memberService.loginEvent();
+ loginEvent.putAll(birthdayEvent);
+ return new FebsResponse().success().data(loginEvent);
}
}
--
Gitblit v1.9.1