3.13完善退款审核的合计数

src/main/java/com/example/demo/controller/ConsumeController.java

@@ -75,4 +75,13 @@ public class ConsumeController {
         System.out.println(name + "name");
         return Result.success(consumeService.getProduct(name));
     }
+    @PostMapping("/SumConsume")
+    public Result getSumConsume(@RequestBody ConsumeDetail consumeDetail) {
+        try {
+            return Result.success(consumeService.getSumConsume(consumeDetail));
+        } catch (Exception e) {
+            log.error(Arrays.toString(e.getStackTrace()));
+            return Result.error(e.getMessage());
+        }
+    }
 }

src/main/java/com/example/demo/controller/RechargeController.java

@@ -114,7 +114,7 @@ public class RechargeController {
 
     @PostMapping("/RechargeA")
     public Result searchRechargeA(@RequestBody RechargeA rechargeA) {
-        List<RechargeA> result = rechargeService.getRechargeA(rechargeA.getFlags());
+        List<RechargeA> result = rechargeService.getRechargeA(rechargeA);
         return Result.success(result);
     }
 }

src/main/java/com/example/demo/controller/RefundController.java

@@ -3,6 +3,8 @@ package com.example.demo.controller;
 
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.vo.Page;
+import com.example.demo.domain.vo.RechargeA;
+import com.example.demo.domain.vo.RefundA;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.sevice.RefundService;
 import lombok.RequiredArgsConstructor;
@@ -12,6 +14,7 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 
 @RestController
 @RequestMapping("/refund")
@@ -97,4 +100,10 @@ public class RefundController {
             return Result.success(refundService.searchForPage(page.getPageNum(), page.getPageSize(),page.getDetail()));
         }
     }
+
+    @PostMapping("/RefundA")
+    public Result getRefundA(@RequestBody RefundA refundA) {
+        List<RefundA> result = refundService.getRefundA(refundA);
+        return Result.success(result);
+    }
 }

src/main/java/com/example/demo/domain/vo/RechargeA.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -17,6 +19,16 @@ public class RechargeA {
 
     private String flag;
 
-    private String flags;
+    private List<Integer> flags;
     private String token;
+
+    private String jwcode;
+    private String activityId;
+    private Integer adminId;
+    private Date startDate;
+    private Date endDate;
+    private String payWay;
+    private String rechargeWay;
+    private String area;
+    private Integer status;
 }

src/main/java/com/example/demo/domain/vo/RefundA.java

@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Data
 @NoArgsConstructor
@@ -14,9 +16,23 @@ public class RefundA {
     private BigDecimal SumRaudit;
     private BigDecimal SumRaudit1;
     private BigDecimal SumRaudit2;
+    private BigDecimal SumRaudit3;
+
 
     private String flag;
 
-    private String flags;
+    private List<Integer> flags;
     private String token;
+
+    private String jwcode;
+    private String activityId;
+    private Integer adminId;
+    private Date startDate;
+    private Date endDate;
+    private String payWay;
+    private String rechargeWay;
+    private String area;
+    private String status;
+    private String refundType;
+    private String refundGoods;
 }

src/main/java/com/example/demo/domain/vo/SumConsume.java

@@ -0,0 +1,15 @@
+package com.example.demo.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SumConsume {
+    private Integer Sumcion;
+    private Integer SumRcion;
+    private Integer SumFcion;
+    private Integer SumTcion;
+}

src/main/java/com/example/demo/mapper/ConsumeMapper.java

@@ -3,6 +3,7 @@ package com.example.demo.mapper;
 
 import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.ConsumeDetail;
+import com.example.demo.domain.vo.SumConsume;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -93,4 +94,5 @@ public interface ConsumeMapper {
 
 
 
+    SumConsume getSumConsume(ConsumeDetail consumeDetail);
 }

src/main/java/com/example/demo/mapper/RechargeMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 @Mapper
 public interface RechargeMapper {
 
-    List<RechargeA> getRechargeA(@Param("flags") List<Integer> flags);
+    List<RechargeA> getRechargeA(RechargeA rechargeA);
 
     @Insert({
             "INSERT INTO recharge",

src/main/java/com/example/demo/mapper/RefundMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Mapper
 public interface RefundMapper {
 
-    List<RefundA> getRefundA(@Param("flags") List<Integer> flags);
+    List<RefundA> getRefundA(RefundA refundA);
 
     @Insert({
             "insert into detail",

src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java

@@ -6,6 +6,7 @@ import com.example.demo.domain.entity.*;
 import com.example.demo.domain.vo.ConsumeDetail;
 import com.example.demo.domain.vo.DetailVo;
 import com.example.demo.domain.vo.DetailYVo;
+import com.example.demo.domain.vo.SumConsume;
 import com.example.demo.mapper.ConsumeMapper;
 import com.example.demo.mapper.UserMapper;
 import com.example.demo.sevice.ConsumeService;
@@ -124,6 +125,11 @@ public class ConsumeServiceImpl implements ConsumeService {
         return new PageInfo<>(list);
     }
 
+    @Override
+    public SumConsume getSumConsume(ConsumeDetail consumeDetail) {
+        return consumeMapper.getSumConsume(consumeDetail);
+    }
+
     public   List<Detail> getDeatil(Integer jwcode){
         return  consumeMapper.getDeatil(jwcode);
     }

src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java

@@ -205,13 +205,11 @@ public class RechargeServiceImpl implements RechargeService {
     }
 
     @Override
-    public List<RechargeA> getRechargeA(String flags) {
-        List<Integer> flagList = Arrays.stream(flags.split(","))
-                .map(Integer::parseInt)
-                .collect(Collectors.toList());
-        return rechargeMapper.getRechargeA(flagList);
-    }
+    public List<RechargeA> getRechargeA(RechargeA rechargeA) {
+
+            return rechargeMapper.getRechargeA(rechargeA);
 
 
+    }
 }
 

src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java

@@ -2,6 +2,7 @@ package com.example.demo.serviceImpl;
 
 
 import com.example.demo.domain.entity.Detail;
+import com.example.demo.domain.vo.RefundA;
 import com.example.demo.mapper.RefundMapper;
 import com.example.demo.sevice.RefundService;
 import com.github.pagehelper.PageHelper;
@@ -116,4 +117,9 @@ public class RefundServiceImpl implements RefundService {
         List<Detail> list = refundMapper.select(detail);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public List<RefundA> getRefundA(RefundA refundA) {
+       return refundMapper.getRefundA(refundA);
+    }
 }

src/main/java/com/example/demo/sevice/ConsumeService.java

@@ -8,6 +8,7 @@ import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.ConsumeDetail;
 import com.example.demo.domain.vo.DetailVo;
 import com.example.demo.domain.vo.DetailYVo;
+import com.example.demo.domain.vo.SumConsume;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
@@ -23,4 +24,5 @@ public interface ConsumeService {
     List<ConsumeDetail> search(ConsumeDetail consumeDetail);
 
     PageInfo<ConsumeDetail> searchForPage(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail);
+    SumConsume getSumConsume(ConsumeDetail consumeDetail);
 }

src/main/java/com/example/demo/sevice/RechargeService.java

@@ -28,5 +28,5 @@ public interface RechargeService {
      */
     Result addRecharges(List<Recharge> recharges);
 
-    List<RechargeA> getRechargeA(String flags);
+    List<RechargeA> getRechargeA(RechargeA rechargeA);
 }

src/main/java/com/example/demo/sevice/RefundService.java

@@ -2,6 +2,7 @@ package com.example.demo.sevice;
 
 
 import com.example.demo.domain.entity.Detail;
+import com.example.demo.domain.vo.RefundA;
 import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
@@ -20,5 +21,6 @@ public interface RefundService {
     Detail selectByDetailId(Integer detailId);
     List<Detail> search(Detail detail);
     PageInfo<Detail> searchForPage(Integer pageNum, Integer pageSize, Detail detail);
+    List<RefundA> getRefundA(RefundA refundA);
 
 }

src/main/resources/application.yml

@@ -16,8 +16,8 @@ spring:
       connection-timeout: 30000
       pool-name: HwgoldHikariCP
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=GMT%2b8
+#    url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://39.101.133.168/hwgold?serverTimezone=Asia/Shanghai
     username: hwgold
     password: 'AGX4Z3YMxiCG3GR2'
   application:

src/main/resources/mapper/AuditMapper.xml

@@ -1,5 +0,0 @@
-<?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.DetailYMapper"  >

src/main/resources/mapper/ConsumeMapper.xml

@@ -0,0 +1,22 @@
+<?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.ConsumeMapper">
+    <select id="getSumConsume" resultMap="com.example.demo.domain.vo.SumConsume">
+        SELECT
+        sum(free_coin) as SumFcion,
+        sum(task_coin) as SumTcion,
+        sum(recharge_coin) as SumRcion,
+        sum(recharge_coin+free_coin+task_coin) as Sumcion
+        <where>
+            //            `detail_flag`=1 AND update_type = '1'
+            update_type=1
+            <if test='jwcode!=null'>and detail_y.jwcode =#{jwcode}</if>
+            <if test='productName!=null and productName.length>0'>and product.name = #{productName}</if>
+            <if test='consumePlatform!=null and consumePlatform.length>0'>and detail_y.consume_platform=#{consumePlatform}</if>
+            <if test='consumeType!=null and consumeType.length>0'>and detail_y.consume_type= #{consumeType}</if>
+            <if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>
+            </where>
+    </select>
+</mapper>

src/main/resources/mapper/RechargeMapper.xml

@@ -4,26 +4,39 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.example.demo.mapper.RechargeMapper">
-<select id="getRechargeA" resultType="com.example.demo.domain.vo.RechargeA">
-    SELECT
-    CASE
-    WHEN flag = 0 THEN '待审核'
-    WHEN flag = 1 THEN '已通过'
-    WHEN flag = 2 THEN '已驳回'
-    ELSE '其他状态'
-    END AS flag,
-    COUNT(*) AS Raudit,
-    SUM(paid_gold) AS SumRaudit,
-    SUM(free_gold) AS SumRaudit1,
-    (SUM(paid_gold) + SUM(free_gold)) AS SumRaudit2
-    FROM
-    recharge
-    WHERE
-    flag IN
-    <foreach collection="flags" item="flag" open="(" separator="," close=")">
-        #{flag}
-    </foreach>
-    GROUP BY
-    flag;
-</select>
-    </mapper>
+
+    <select id="getRechargeA" resultType="com.example.demo.domain.vo.RechargeA">
+        SELECT
+        CASE
+        WHEN flag = 0 THEN '待审核'
+        WHEN flag = 1 THEN '已通过'
+        WHEN flag = 2 THEN '已驳回'
+        ELSE '其他状态'
+        END AS flag,
+        COUNT(*) AS Raudit,
+        SUM(paid_gold) AS SumRaudit1,
+        SUM(free_gold) AS SumRaudit2,
+        (SUM(paid_gold) + SUM(free_gold)) AS SumRaudit
+        FROM
+        recharge
+        <where>
+            <!-- 动态条件：flag -->
+            <if test="flags != null and flags.size > 0">
+                flag IN
+                <foreach collection="flags" item="flag" open="(" separator="," close=")">
+                    #{flag}
+                </foreach>
+            </if>
+            <if test='jwcode!=null and jwcode.length>0'>and recharge.jwcode=#{jwcode}</if>
+            <if test='activityId!=null'>and recharge.activity_id=#{activityId}</if>
+            <if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>
+            <if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>
+            <if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>
+            <if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>
+            <if test='area!=null and area.length>0'>and user.area=#{area}</if>
+            <if test='status!=null'>and audit.status=#{status}</if>
+        </where>
+        GROUP BY
+        flag;
+    </select>
+</mapper>

src/main/resources/mapper/RefundMapper.xml

@@ -2,40 +2,40 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.demo.mapper.RechargeMapper">
-
-    <select id="getRechargeA" resultType="com.example.demo.domain.vo.RechargeA">
+<mapper namespace="com.example.demo.mapper.RefundMapper">
+    <select id="getRefundA" resultType="com.example.demo.domain.vo.RefundA">
         SELECT
         CASE
-        WHEN flag = 0 THEN '待审核'
-        WHEN flag = 1 THEN '已通过'
-        WHEN flag = 2 THEN '已驳回'
+        WHEN au.status = 0 THEN '未审核'
+        WHEN au.status = 1 THEN '已通过'
+        WHEN au.status = 2 THEN '已驳回'
         ELSE '其他状态'
-        END AS flag,
+        END AS status,
         COUNT(*) AS Raudit,
-        SUM(paid_gold) AS SumRaudit,
-        SUM(free_gold) AS SumRaudit1,
-        (SUM(paid_gold) + SUM(free_gold)) AS SumRaudit2
+        SUM(d.recharge_coin) AS SumRaudit1,
+        SUM(d.free_coin) AS SumRaudit2,
+        SUM(d.task_coin) AS SumRaudit3,
+        (SUM(d.recharge_coin) + SUM(d.free_coin) + SUM(d.task_coin)) AS SumRaudit
         FROM
-        recharge
+        detail d
+        LEFT JOIN audit au ON d.detail_id = au.refund_id
         <where>
-            <!-- 动态条件：flag -->
+            d.detail_flag = 1
+            AND d.update_type = 2
+
             <if test="flags != null and flags.size > 0">
-                flag IN
-                <foreach collection="flags" item="flag" open="(" separator="," close=")">
-                    #{flag}
+               and au.status IN
+                <foreach collection="flags" item="au.status" open="(" separator="," close=")">
+                    #{au.status}
                 </foreach>
             </if>
             <if test='jwcode!=null and jwcode.length>0'>and recharge.jwcode=#{jwcode}</if>
-            <if test='activityId!=null'>and recharge.activity_id=#{activityId}</if>
-            <if test='adminId!=null'>and recharge.admin_id=#{adminId}</if>
             <if test='startDate != null and endDate != null'>AND recharge.create_time BETWEEN #{startDate} AND #{endDate}</if>
-            <if test='payWay!=null and payWay.length>0 '>and pay_way like concat('%',#{payWay},'%')</if>
-            <if test='rechargeWay!=null and rechargeWay.length>0 '>and recharge_way like concat('%',#{rechargeWay},'%')</if>
             <if test='area!=null and area.length>0'>and user.area=#{area}</if>
-            <if test='status!=null'>and audit.status=#{status}</if>
+            <if test='refundType != null and refundType.length>0'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>
+            <if test='refundGoods != null and refundGoods.length>0'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>
         </where>
         GROUP BY
-        flag;
+        au.status
     </select>
 </mapper>