From 15559a2b23c8a6b53f0f7cd23406494a53b6b722 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 10:43:19 +0800
Subject: [PATCH] feat(mall): 优化会员资金流水页面并添加新功能

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   14 ++++++++++++--
 1 files changed, 12 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 2dd08c5..636d63c 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
@@ -275,12 +275,18 @@
         );
         if(happyMemberLevel != null){
             mallMemberVo.setLevelName(happyMemberLevel.getName());
+            mallMemberVo.setLevelNamePng(happyMemberLevel.getIconPng());
         }
         if(StrUtil.isNotEmpty(mallMember.getReferrerId())){
             MallMember referMember = this.baseMapper.selectInfoByInviteId(mallMember.getReferrerId());
             if (referMember != null) {
                 mallMemberVo.setReferrerName(referMember.getName());
             }
+        }
+        if(mallMember.getStoreMaster() == 0){
+            mallMemberVo.setIsTeamLeader(2);
+        }else{
+            mallMemberVo.setIsTeamLeader(1);
         }
 
         if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
@@ -919,10 +925,12 @@
         mallMoneyFlowService.addMoneyFlow(
                 memberId,
                 amount,
-                MoneyFlowTypeEnum.RECHARGE.getValue(),
+                ScoreFlowTypeEnum.RECHARGE_ING.getValue(),
                 rechargeNo,
                 FlowTypeEnum.BALANCE.getValue(),
-                "余额充值",1);
+                StrUtil.format(ScoreFlowTypeEnum.RECHARGE_ING.getDesc(),amount),
+                1
+        );
 
         String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
         String payResultStr = brandWCPayRequestData.getPrepay_id();
@@ -1606,6 +1614,8 @@
             apiMemberNewGiftSettingVo.setCouponName(coupons.get(0).getName());
         }
 
+        this.baseMapper.updateLastLoginTime(memberId,new Date());
+
         return new FebsResponse().success().data(apiMemberNewGiftSettingVo);
     }
 

--
Gitblit v1.9.1