From 15c200aa7e0ced518364a68769503472b542c9f4 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 08 Jul 2025 14:03:57 +0800
Subject: [PATCH] feat(mall): 添加会员数据统计功能

---
 src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
index 800f122..6c75d69 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
@@ -4,25 +4,31 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.OrderPayMethodEnum;
+import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
 import cc.mrbird.febs.mall.dto.*;
 import cc.mrbird.febs.mall.entity.*;
 import cc.mrbird.febs.mall.service.IAdminMallMemberService;
 import cc.mrbird.febs.mall.service.IApiMallMemberService;
 import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.system.entity.User;
 import cc.mrbird.febs.vip.entity.MallVipBenefitsRecord;
 import cc.mrbird.febs.vip.mapper.MallVipBenefitsRecordMapper;
 import cc.mrbird.febs.vip.service.IMallVipBenefitsService;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +43,12 @@
     private final IApiMallMemberService apiMallMemberService;
     private final IMallVipBenefitsService mallVipBenefitsService;
     private final MallVipBenefitsRecordMapper mallVipBenefitsRecordMapper;
+
+    @GetMapping("dataInfo")
+    public FebsResponse dataInfo() {
+
+        return mallMemberService.dataInfo();
+    }
 
     /**
      * 平台账单
@@ -589,12 +601,21 @@
     }
 
     /**
-     * 会员列表-核销员设置
+     * 会员列表-活动核销员设置
      */
     @GetMapping("checkOrder/{id}")
     @ControllerEndpoint(operation = " 会员列表-核销员设置", exceptionMessage = "操作失败")
     public FebsResponse checkOrder(@NotNull(message = "{required}") @PathVariable Long id) {
         return mallMemberService.checkOrder(id);
+    }
+
+    /**
+     * 会员列表-自提核销核销员设置
+     */
+    @GetMapping("checkLeader/{id}")
+    @ControllerEndpoint(operation = " 会员列表-自提核销员设置", exceptionMessage = "操作失败")
+    public FebsResponse checkLeader(@NotNull(message = "{required}") @PathVariable Long id) {
+        return mallMemberService.checkLeader(id);
     }
 
     /**
@@ -631,8 +652,17 @@
 
     @PostMapping("vipLevelSetUpdate")
     public FebsResponse vipLevelSetUpdate(MallMember member) {
-        member.setVipLevelTime(new Date());
-        mallMemberService.updateById(member);
+        MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
+        mallMember.setDirector(member.getDirector());
+        mallMemberService.updateById(mallMember);
+        return new FebsResponse().success().message("操作成功");
+    }
+
+    @PostMapping("saleLevelSetUpdate")
+    public FebsResponse saleLevelSetUpdate(MallMember member) {
+        MallMember mallMember = mallMemberService.getBaseMapper().selectById(member.getId());
+        mallMember.setStoreMaster(member.getStoreMaster());
+        mallMemberService.updateById(mallMember);
         return new FebsResponse().success().message("操作成功");
     }
 

--
Gitblit v1.9.1