Merge branch 'milestone-20250727-金币重构三期' into sunjiabei/feature-20250725135225-金币三期

src/main/java/com/example/demo/controller/bean/BeanConsumeController.java

@@ -0,0 +1,43 @@
+package com.example.demo.controller.bean;
+
+import com.example.demo.domain.vo.bean.BeanPage;
+import com.example.demo.domain.vo.coin.Result;
+import com.example.demo.service.bean.BeanConsumeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeController
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 11:30
+ * @Version 1.0
+ **/
+@RestController
+@RequestMapping("/beanConsume")
+@RequiredArgsConstructor
+@Slf4j
+@CrossOrigin
+public class BeanConsumeController {
+    @Autowired
+    private BeanConsumeService beanConsumeService;
+
+    //获取用户分布信息
+    @PostMapping("/getDept")
+    public Result getDept(){
+
+            List<String> deptList = beanConsumeService.getDept();
+            return Result.success(deptList);
+    }
+
+    @PostMapping("/selectBy")
+    public Result selectBy(@RequestBody BeanPage beanPage){
+        return null;
+    }
+
+}

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java

@@ -0,0 +1,38 @@
+package com.example.demo.domain.vo.bean;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsume
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 10:41
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BeanConsumeLive {
+    private static final long serialVersionUID = 1L;
+    private String name;    //姓名
+    private Integer jwcode; //精网号
+    private List<String> dept;    //地区/分部
+    //类型 直播： 1. 发礼物2. 发红包3. 发福袋4. 付费直播5. 加入粉丝团6. 发弹幕
+    //文章：    1. 打赏2. 付费
+    private String type;    //类型
+    private String gift;    //礼物名称
+    private String beanNum; //金豆数量
+    private String channel;  //频道名称（截取content）
+    private String liveName;    //直播间名称
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date time; // 消费时间 （时间戳转化）
+    private Integer payType;    //支付方式（直播：12345，铁粉：7，文章：8）
+
+}

src/main/java/com/example/demo/domain/vo/bean/BeanPage.java

@@ -0,0 +1,24 @@
+package com.example.demo.domain.vo.bean;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @program: gold-java
+ * @ClassName Page
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 11:44
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+public class BeanPage {
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+    private Integer pageNum;
+    private Integer pageSize;
+
+    private BeanConsumeLive beanConsumeLive;
+}

src/main/java/com/example/demo/domain/vo/coin/Page.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.vo.coin;
 
 import com.example.demo.domain.entity.User;
+import com.example.demo.domain.vo.bean.BeanConsumeLive;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -29,4 +30,5 @@ public class Page {
     private RefundAudit refundAudit;
     private RechargeUser rechargeUser;
     private RoleVo roleVo;
+
 }

src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java

@@ -0,0 +1,18 @@
+package com.example.demo.mapper.bean;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeMapper.xml
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 11:56
+ * @Version 1.0
+ **/
+@Mapper
+public interface BeanConsumeMapper {
+    List<String> getDept();
+}

src/main/java/com/example/demo/mapper/coin/PermissionMapper.java

@@ -3,7 +3,6 @@ package com.example.demo.mapper.coin;
 import com.example.demo.domain.entity.Admin;
 import com.example.demo.domain.entity.AdminRole;
 import com.example.demo.domain.entity.Role;
-import com.example.demo.domain.vo.coin.AdminVo;
 import com.example.demo.domain.vo.coin.Permission;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -30,4 +29,16 @@ public interface PermissionMapper {
 //    Integer deleteAdminRole(Integer id);
     Integer updateAdminRole(AdminRole adminRole);
     Integer updateAdmin(Admin admin);
+
+    /**
+     * @program: gold-java
+     * @ClassName BeanConsumeMapper.xml
+     * @description:
+     * @author: Ethan
+     * @create: 2025−07-30 11:55
+     * @Version 1.0
+     **/
+
+    interface BeanConsumeMapper {
+    }
 }

src/main/java/com/example/demo/service/bean/BeanConsumeService.java

@@ -0,0 +1,17 @@
+package com.example.demo.service.bean;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeService
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 11:53
+ * @Version 1.0
+ **/
+
+public interface BeanConsumeService {
+    //获取用户分部
+    List<String> getDept();
+}

src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -0,0 +1,28 @@
+package com.example.demo.serviceImpl.bean;
+
+import com.example.demo.mapper.bean.BeanConsumeMapper;
+import com.example.demo.service.bean.BeanConsumeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeServiceImpl
+ * @description:
+ * @author: Ethan
+ * @create: 2025−07-30 11:53
+ * @Version 1.0
+ **/
+@Service
+public class BeanConsumeServiceImpl implements BeanConsumeService {
+    @Autowired
+    private BeanConsumeMapper BeanConsumeMapper;
+
+    @Override
+    public List<String> getDept() {
+        List<String> deptList = BeanConsumeMapper.getDept();
+        return deptList;
+    }
+}

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.demo.mapper.bean.BeanConsumeMapper">
+
+
+    <select id="getDept" resultType="java.lang.String">
+        select distinct dept from fx_member
+    </select>
+</mapper>