8月1日充值审核接口补全

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

@@ -1,6 +1,8 @@
 package com.example.demo.controller.bean;
 
 import com.example.demo.domain.vo.bean.BeanAuditInfo;
+import com.example.demo.domain.vo.bean.BeanRechargeInfo;
+import com.example.demo.domain.vo.bean.GoldBean;
 import com.example.demo.domain.vo.coin.Page;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.service.bean.BeanAuditService;
@@ -73,4 +75,15 @@ public class BeanAuditController {
             return Result.error("更新失败，查看id");
         }
     }
+
+    //金豆统计
+    @PostMapping("/statsBean")
+    public Result statsBean(@RequestBody BeanAuditInfo beanAuditInfo) {
+        try {
+            GoldBean goldBean = beanAuditService.statsBean(beanAuditInfo);
+            return Result.success(goldBean);
+        } catch (Exception e) {
+            return Result.error("请检查数据的格式");
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo.bean;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,21 +23,31 @@ import java.util.List;
 @AllArgsConstructor
 public class BeanRechargeInfo {
 
+
     private Long id;//id
+    @ExcelProperty("精网号")
     private Integer jwcode; // 精网号
+    @ExcelProperty("客户姓名")
     private String name; // 姓名
+    @ExcelProperty("所属地区")
     private String market; // 所属地区
+    @ExcelProperty("免费金豆")
     private Integer freeBean; // 免费豆
+    @ExcelProperty("永久金豆")
     private Integer permanentBean; // 永久豆
+    @ExcelProperty("金额")
     private Double money; // 金额
+    @ExcelProperty("数量")
     private  Integer num; // 数量
-    private Double amount; // 金额
+    @ExcelProperty("订单号")
     private String orderNo; // 订单号
+    @ExcelProperty("备注")
     private String remark; //备注
+    @ExcelProperty("充值平台")
     private String platform; // 充值平台
+    @ExcelProperty("充值时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date rechargeTime; // 充值时间
-    private Integer time;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     private Date startTime; // 开始时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

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

@@ -21,4 +21,5 @@ public class GoldBean {
     private Integer permanentBean; // 永久豆
     private Double money; // 金额
     private Integer beanNum; // 豆数量
+    private Integer num; // 订单数
 }

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

@@ -2,6 +2,7 @@ package com.example.demo.service.bean;
 
 import com.example.demo.domain.vo.bean.BeanAuditInfo;
 import com.example.demo.domain.vo.bean.BeanRechargeInfo;
+import com.example.demo.domain.vo.bean.GoldBean;
 import com.example.demo.domain.vo.coin.Result;
 import com.github.pagehelper.PageInfo;
 
@@ -21,4 +22,6 @@ public interface BeanAuditService {
     Result updateStatus1(Long id);
 
     void updateStatus2(Long id);
+
+    GoldBean statsBean(BeanAuditInfo beanAuditInfo);
 }

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

@@ -2,6 +2,7 @@ package com.example.demo.serviceImpl.bean;
 
 import com.example.demo.domain.vo.bean.BeanAuditInfo;
 import com.example.demo.domain.vo.bean.BeanRechargeInfo;
+import com.example.demo.domain.vo.bean.GoldBean;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.coin.BeanAuditMapper;
 import com.example.demo.service.bean.BeanAuditService;
@@ -95,4 +96,36 @@ public class BeanAuditServiceImpl implements BeanAuditService {
     public void updateStatus2(Long id) {
         beanAuditMapper.updateStatus2(id);
     }
+
+    @Override
+    public GoldBean statsBean(BeanAuditInfo beanAuditInfo) {
+        GoldBean gold = new GoldBean();
+        List<BeanAuditInfo> beanAuditInfos = beanAuditMapper.selectBy(beanAuditInfo);
+
+        // 初始化累加器
+        int permanentGoldSum = 0;
+        int freeGoldSum = 0;
+        int num = 0;
+
+        // 遍历充值记录并累加金币
+        for (BeanAuditInfo info : beanAuditInfos) {
+            // 累加永久金币
+            if (info.getPermanentBean() != null) {
+                permanentGoldSum += info.getPermanentBean();
+            }
+            // 累加免费金币
+            if (info.getFreeBean() != null) {
+                freeGoldSum += info.getFreeBean();
+            }
+            num++;
+        }
+
+        // 将累加结果设置到Gold对象
+        gold.setPermanentBean(permanentGoldSum);
+        gold.setFreeBean(freeGoldSum);
+        gold.setNum(num);
+        gold.setBeanNum(permanentGoldSum + freeGoldSum);
+        return gold;
+    }
+
 }