From 3e3e54ccd6b95746f854ed27073d73b35d64e122 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 11:26:01 +0800
Subject: [PATCH] feat(mall): 新增新人礼弹窗逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 879af4e..2dd08c5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -649,6 +649,7 @@
                     mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
                     mallMember.setOpenId(openId);
                     mallMember.setSessionKey(sessionKey);
+                    mallMember.setTradePassword(SecureUtil.md5("123456"));
 
                     if (StrUtil.isNotBlank(apiXcxLoginDto.getInviteId())) {
                         MallMember member = this.baseMapper.selectInfoByInviteId(apiXcxLoginDto.getInviteId());
@@ -1568,13 +1569,31 @@
 
     @Override
     public FebsResponse newGiftEvent() {
+        // 获取当前登录用户的ID
+        Long memberId = LoginUserUtil.getLoginUser().getId();
+
+        ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo();
+
+        MallMember mallMember = this.baseMapper.selectById(memberId);
+        Date lastLoginTime = mallMember.getLastLoginTime();
+        if(lastLoginTime == null){
+            apiMemberNewGiftSettingVo.setOpenState(1);
+        }
+        if(lastLoginTime != null){
+            Date now = new Date();
+            long between = DateUtil.between(lastLoginTime, now, DateUnit.DAY);
+            if(between > 0){
+                apiMemberNewGiftSettingVo.setOpenState(1);
+            }else{
+                apiMemberNewGiftSettingVo.setOpenState(0);
+            }
+        }
+
         DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                 CommonDictionaryEnum.NEW_GIFT_SETTING.getType(),
                 CommonDictionaryEnum.NEW_GIFT_SETTING.getCode()
         );
         ApiNewGiftSettingDto apiNewGiftSettingDto = JSONObject.parseObject(dic.getValue(), ApiNewGiftSettingDto.class);
-
-        ApiMemberNewGiftSettingVo apiMemberNewGiftSettingVo = new ApiMemberNewGiftSettingVo();
         apiMemberNewGiftSettingVo.setState(apiNewGiftSettingDto.getState());
         apiMemberNewGiftSettingVo.setPrizeScore(apiNewGiftSettingDto.getPrizeScore());
 

--
Gitblit v1.9.1