diff --git a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java b/src/main/java/com/example/demo/controller/bean/BeanAuditController.java index 98f89bb..9d45ce8 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanAuditController.java @@ -58,8 +58,10 @@ public class BeanAuditController { @PostMapping("/status1") public Result updateStatus1(@RequestBody BeanAuditInfo beanAuditInfo) { try { - - return beanAuditService.updateStatus1(beanAuditInfo.getId()); + if (ObjectUtils.isEmpty(beanAuditInfo.getId())) { + return Result.error("id不能为空"); + } + return beanAuditService.updateStatus1(beanAuditInfo); } catch (Exception e) { e.printStackTrace(); return Result.error("更新失败,查看id"); @@ -69,7 +71,13 @@ public class BeanAuditController { @PostMapping("/status2") public Result updateStatus2(@RequestBody BeanAuditInfo beanAuditInfo) { try { - beanAuditService.updateStatus2(beanAuditInfo.getId()); + if (ObjectUtils.isEmpty(beanAuditInfo.getId())) { + return Result.error("id不能为空"); + } + if (ObjectUtils.isEmpty(beanAuditInfo.getReason())) { + return Result.error("审核意见不能为空"); + } + beanAuditService.updateStatus2(beanAuditInfo); return Result.success(); } catch (Exception e) { return Result.error("更新失败，查看id"); 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/BeanAuditInfo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java index 32f8011..bed1057 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanAuditInfo.java @@ -30,6 +30,7 @@ public class BeanAuditInfo { private String remark; // 备注 private String submitName; // 提交人名称 private String auditName; // 审核人名称 + private String reason; // 审核意见 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; //创建时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") 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/coin/BeanAuditMapper.java b/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java index 43aa277..2d0520e 100644 --- a/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/BeanAuditMapper.java @@ -24,8 +24,8 @@ public interface BeanAuditMapper { BeanAuditInfo selectById(Long id); //根据id更新状态为1 - void updateStatus1(Long id); + void updateStatus1(BeanAuditInfo beanAuditInfo); //根据id更新状态为2 - void updateStatus2(Long id); + void updateStatus2(BeanAuditInfo beanAuditInfo); } 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/BeanAuditService.java b/src/main/java/com/example/demo/service/bean/BeanAuditService.java index 54bb0f1..3571ea0 100644 --- a/src/main/java/com/example/demo/service/bean/BeanAuditService.java +++ b/src/main/java/com/example/demo/service/bean/BeanAuditService.java @@ -19,9 +19,9 @@ public interface BeanAuditService { //查找审核信息 PageInfo selectBy(Integer pageNum, Integer pageSize, BeanAuditInfo beanAuditInfo); - Result updateStatus1(Long id); + Result updateStatus1(BeanAuditInfo beanAuditInfo); - void updateStatus2(Long id); + void updateStatus2(BeanAuditInfo beanAuditInfo); GoldBean statsBean(BeanAuditInfo beanAuditInfo); } 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/BeanAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java index f7e5faa..40d84c5 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java @@ -54,8 +54,8 @@ public class BeanAuditServiceImpl implements BeanAuditService { @Transactional @Override - public Result updateStatus1(Long id) { - BeanAuditInfo beanAuditInfo = beanAuditMapper.selectById(id); + public Result updateStatus1(BeanAuditInfo info) { + BeanAuditInfo beanAuditInfo = beanAuditMapper.selectById(info.getId()); String jwcode = beanAuditInfo.getJwcode().toString(); String op = "recharge"; // 操作类型（根据实际业务定义，例如"recharge"表示充值） String content = beanAuditInfo.getRemark(); // 备注作为content参数 @@ -88,13 +88,13 @@ public class BeanAuditServiceImpl implements BeanAuditService { if (!response2.getStatusCode().is2xxSuccessful()) { return Result.error("付费远程接口调用失败，状态码：" + response2.getStatusCodeValue()); } - beanAuditMapper.updateStatus1(id); + beanAuditMapper.updateStatus1(info); return Result.success(); } @Override - public void updateStatus2(Long id) { - beanAuditMapper.updateStatus2(id); + public void updateStatus2(BeanAuditInfo beanAuditInfo) { + beanAuditMapper.updateStatus2(beanAuditInfo); } @Override 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 diff --git a/src/main/resources/mapper/BeanAuditMapper.xml b/src/main/resources/mapper/BeanAuditMapper.xml index f2ea51d..3375009 100644 --- a/src/main/resources/mapper/BeanAuditMapper.xml +++ b/src/main/resources/mapper/BeanAuditMapper.xml @@ -69,14 +69,17 @@ update audit - set audit_status = 1 + set audit_status = 1, + audit_name = #{auditName} where id = #{id} update audit - set audit_status = 2 + set audit_status = 2, + audit_name = #{auditName}, + reason = #{reason} where id = #{id}