3.13完善退款审核的合计数

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

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

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

@@ -16,4 +16,10 @@ public class DetailYgold {
     private String jwcode;
     private Integer Rcoin;
     private Integer Scoin;
+
+
+    private BigDecimal SumbuyJb;
+    private BigDecimal SumcoreJb;
+    private BigDecimal Sumfree12;
+    private BigDecimal Sumfree6;
 }

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

@@ -4,12 +4,22 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 public class SumConsume {
-    private Integer Sumcion;
-    private Integer SumRcion;
-    private Integer SumFcion;
-    private Integer SumTcion;
+    private BigDecimal Sumcion;
+    private BigDecimal SumRcion;
+    private BigDecimal SumFcion;
+    private BigDecimal SumTcion;
+    private String jwcode;
+    private String consumePlatform;
+    private String consumeType;
+    private String productName;
+    private Date startDate;
+    private Date endDate;
+    private String token;
 }

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

@@ -11,6 +11,8 @@ import java.util.List;
 @Mapper
 public interface ConsumeMapper {
 
+    SumConsume getSumConsume(SumConsume sumConsume);
+
     //通过id查询user全部信息
     @Select({
             "select * from user where user_id=#{userId}"
@@ -94,5 +96,5 @@ public interface ConsumeMapper {
 
 
 
-    SumConsume getSumConsume(ConsumeDetail consumeDetail);
+
 }

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

@@ -10,6 +10,10 @@ import java.util.List;
 
 @Mapper
 public interface DetailYMapper {
+
+
+    DetailYgold getgold(DetailYgold detailYgold);
+
     @Insert({
 //            "insert into detail_y",
 //            "(jwcode,order_code,activity_id,recharge_way,product_id,consume_platform,consume_type,refund_type,refund_goods,name,username,area" +

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

@@ -126,8 +126,8 @@ public class ConsumeServiceImpl implements ConsumeService {
     }
 
     @Override
-    public SumConsume getSumConsume(ConsumeDetail consumeDetail) {
-        return consumeMapper.getSumConsume(consumeDetail);
+    public SumConsume getSumConsume(SumConsume sumConsume) {
+        return consumeMapper.getSumConsume(sumConsume);
     }
 
     public   List<Detail> getDeatil(Integer jwcode){

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

@@ -24,5 +24,5 @@ public interface ConsumeService {
     List<ConsumeDetail> search(ConsumeDetail consumeDetail);
 
     PageInfo<ConsumeDetail> searchForPage(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail);
-    SumConsume getSumConsume(ConsumeDetail consumeDetail);
+    SumConsume getSumConsume(SumConsume sumConsume);
 }

src/main/resources/mapper/ConsumeMapper.xml

@@ -3,16 +3,17 @@
         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 id="getSumConsume" resultType="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
+        from detail_y
+        left join product on detail_y.product_id= product.product_id
         <where>
-            //            `detail_flag`=1 AND update_type = '1'
-            update_type=1
-            <if test='jwcode!=null'>and detail_y.jwcode =#{jwcode}</if>
+        update_type = '1'
+            <if test='jwcode!=null and jwcode.length>0'>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>

src/main/resources/mapper/DetailYMapper.xml

@@ -50,4 +50,13 @@
         </otherwise>
     </choose>
 </select>
+
+    <select id="getgold" resultType="com.example.demo.domain.vo.DetailYgold">
+    select
+    sum(recharge_coin) as SumbuyJb,
+    sum(task_coin) as SumcoreJb,
+    sum(free_coin) as SumfreeJb
+    from detail_y
+    group by jwcode
+</select>
 </mapper>