From e91a7b4dce2f249bc6b4f6fe25962d73f9fe3244 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Sat, 2 Aug 2025 10:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=BA=8F=E5=8F=B7=E8=A1=A5?= =?UTF-8?q?=E5=85=85=EF=BC=8C=E9=87=8D=E6=9E=84=E7=9B=B4=E6=92=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/bean/BeanConsumeController.java | 8 ++ .../demo/domain/vo/bean/BeanConsumeArticle.java | 2 + .../demo/domain/vo/bean/BeanConsumeFan.java | 2 + .../demo/domain/vo/bean/BeanConsumeGold.java | 1 + .../demo/domain/vo/bean/BeanConsumeLive.java | 2 + .../com/example/demo/domain/vo/bean/BeanUser.java | 1 + .../com/example/demo/mapper/live/LiveMapper.java | 10 ++ .../demo/service/bean/BeanConsumeService.java | 3 +- .../serviceImpl/bean/BeanConsumeServiceImpl.java | 12 ++- .../resources/jindouMapper/BeanConsumeMapper.xml | 6 +- src/main/resources/jindouMapper/BeanUser.xml | 3 +- src/main/resources/liveMapper/LiveMapper.xml | 108 +++++++++++++++++++-- 12 files changed, 145 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index 14164f1..1711016 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -37,6 +37,14 @@ public class BeanConsumeController { return Result.success(deptList); } + //获取直播消费用户分部信息 + @PostMapping("/getLiveDept") + public Result getLiveDept(){ + + List deptList = beanConsumeService.getLiveDept(); + return Result.success(deptList); + } + //筛选查询直播消费记录 @PostMapping("/selectLiveBy") public Result selectLiveBy(@RequestBody Page page){ diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java index b4cda50..0e008f0 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeArticle.java @@ -22,6 +22,8 @@ import java.util.Date; @JsonIgnoreProperties(ignoreUnknown = true) public class BeanConsumeArticle { private static final long serialVersionUID = 1L; + @ExcelProperty("ID") + private Integer id; @ExcelProperty("姓名") private String name; //姓名 @ExcelProperty("精网号") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java index 1273187..f36a2d9 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeFan.java @@ -22,6 +22,8 @@ import java.util.Date; @JsonIgnoreProperties(ignoreUnknown = true) public class BeanConsumeFan { private static final long serialVersionUID = 1L; + @ExcelProperty("ID") + private Integer id; @ExcelProperty("姓名") private String name; //姓名 @ExcelProperty("精网号") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeGold.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeGold.java index 2e9f885..6be949d 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeGold.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeGold.java @@ -17,6 +17,7 @@ import lombok.NoArgsConstructor; @JsonIgnoreProperties(ignoreUnknown = true) public class BeanConsumeGold { private static final long serialVersionUID = 1L; + private Integer sumBean ; //总金豆 private Integer permanentBean ; //付费金豆 private Integer freeBean ; //免费金豆 private Integer totalNum; //总条数 diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java index 4a75311..c5c3195 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeLive.java @@ -24,6 +24,8 @@ import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) public class BeanConsumeLive { private static final long serialVersionUID = 1L; + @ExcelProperty("ID") + private Integer id; @ExcelProperty("姓名") private String name; //姓名 @ExcelProperty("精网号") diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java index 65fd39a..3230e04 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanUser.java @@ -16,6 +16,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor public class BeanUser { + private Integer id; private String name; //姓名 private Integer jwcode; //精网号 private String dept; //分部 diff --git a/src/main/java/com/example/demo/mapper/live/LiveMapper.java b/src/main/java/com/example/demo/mapper/live/LiveMapper.java index a86daf2..d08e054 100644 --- a/src/main/java/com/example/demo/mapper/live/LiveMapper.java +++ b/src/main/java/com/example/demo/mapper/live/LiveMapper.java @@ -1,5 +1,6 @@ package com.example.demo.mapper.live; +import com.example.demo.domain.vo.bean.BeanConsumeGold; import com.example.demo.domain.vo.bean.BeanConsumeLive; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,14 @@ import java.util.List; **/ @Mapper public interface LiveMapper { + //筛选查询直播消费列表 List selectLiveBy(@Param("beanConsumeLive") BeanConsumeLive beanConsumeLive); + //获取直播礼物列表 + List getLiveGift(); + //获取直播频道列表 + List getLiveChannel(); + //计算直播消费金豆合计数 + BeanConsumeGold selectSumLiveBy(@Param("beanConsumeLive") BeanConsumeLive beanConsumeLive); + //获取直播客户地区 + List getDept(); } diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java index 4982d03..62f0138 100644 --- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java @@ -31,5 +31,6 @@ public interface BeanConsumeService { //获取直播频道 List getLiveChannel(); - + //获取直播客户地区 + List getLiveDept(); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index c1ba2a1..2835cab 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -64,7 +64,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { Integer payType = page.getPayType(); if (payType==1) { //直播消费合计 - gold = beanConsumeMapper.selectSumLiveBy(page.getBeanConsumeLive()); + gold = liveMapper.selectSumLiveBy(page.getBeanConsumeLive()); }else if (payType==7) { //充值消费合计 gold = beanConsumeMapper.selectSumFansBy(page.getBeanConsumeFan()); @@ -79,11 +79,17 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { @Override public List getLiveGift() { - return beanConsumeMapper.getLiveGift(); + return liveMapper.getLiveGift(); } //查询直播全部频道 @Override public List getLiveChannel() { - return beanConsumeMapper.getLiveChannel(); + return liveMapper.getLiveChannel(); + } + + @Override + public List getLiveDept() { + List liveDeptList = liveMapper.getDept(); + return liveDeptList; } } diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index 7e359ec..cdf65bd 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -124,7 +124,8 @@ - select mi.name as name, + select lgg.id as id, + mi.name as name, lgg.jwcode as jwcode, mi.deptName as dept, lg.name as gift, @@ -14,11 +15,106 @@ lp.title as liveChannel, l.name as liveName, lgg.created_at as consumeTime - from live_give_gifts lgg - left join member_info mi on mi.jwcode = lgg.jwcode - left join live_gifts lg on lg.id = lgg.g_id - left join live l on l.id = lgg.live_id - left join live_pindao lp on lp.id = l.channel_id + FROM live_give_gifts lgg + LEFT JOIN live_gifts lg ON lg.id = lgg.g_id + LEFT JOIN live l ON l.id = lgg.live_id + LEFT JOIN live_pindao lp ON lp.pd_id = l.channel_id + LEFT JOIN member_info mi ON mi.jwcode = lgg.jwcode + + + AND lgg.jwcode = #{beanConsumeLive.jwcode} + + + AND mi.deptName = #{beanConsumeLive.dept} + + + + AND lgg.created_at BETWEEN #{beanConsumeLive.startTime} + AND #{beanConsumeLive.endTime} + + + AND lg.name =#{beanConsumeLive.gift} + + + AND lp.title = #{beanConsumeLive.liveChannel} + + + AND l.name LIKE CONCAT('%', #{beanConsumeLive.liveName}, '%') + + + + + ORDER BY ${beanConsumeLive.sortField} ${beanConsumeLive.sortOrder} + + + ORDER BY consumeTime DESC + + + + + + + + + + \ No newline at end of file