From c80ff899b4c5ebd83568e396f9fa24c51ef60efd Mon Sep 17 00:00:00 2001 From: huangqizhen Date: Thu, 13 Mar 2025 13:24:27 +0800 Subject: [PATCH] =?UTF-8?q?3.13=E5=AE=8C=E5=96=84=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=9A=84=E5=90=88=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/ConsumeController.java | 4 ++-- .../java/com/example/demo/domain/vo/DetailYgold.java | 6 ++++++ .../java/com/example/demo/domain/vo/SumConsume.java | 18 ++++++++++++++---- .../java/com/example/demo/mapper/ConsumeMapper.java | 4 +++- .../java/com/example/demo/mapper/DetailYMapper.java | 4 ++++ .../example/demo/serviceImpl/ConsumeServiceImpl.java | 4 ++-- .../java/com/example/demo/sevice/ConsumeService.java | 2 +- src/main/resources/mapper/ConsumeMapper.xml | 9 +++++---- src/main/resources/mapper/DetailYMapper.xml | 9 +++++++++ 9 files changed, 46 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 7e8649d..8f11aec 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/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()); diff --git a/src/main/java/com/example/demo/domain/vo/DetailYgold.java b/src/main/java/com/example/demo/domain/vo/DetailYgold.java index 1181d1f..8ec3589 100644 --- a/src/main/java/com/example/demo/domain/vo/DetailYgold.java +++ b/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; } diff --git a/src/main/java/com/example/demo/domain/vo/SumConsume.java b/src/main/java/com/example/demo/domain/vo/SumConsume.java index 7970bf1..0bc7b01 100644 --- a/src/main/java/com/example/demo/domain/vo/SumConsume.java +++ b/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; } diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index a68d55f..d003e12 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/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); + } diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java index 9bc9565..3133c2d 100644 --- a/src/main/java/com/example/demo/mapper/DetailYMapper.java +++ b/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" + diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 276679e..3da9e32 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/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 getDeatil(Integer jwcode){ diff --git a/src/main/java/com/example/demo/sevice/ConsumeService.java b/src/main/java/com/example/demo/sevice/ConsumeService.java index cb68487..a6f900e 100644 --- a/src/main/java/com/example/demo/sevice/ConsumeService.java +++ b/src/main/java/com/example/demo/sevice/ConsumeService.java @@ -24,5 +24,5 @@ public interface ConsumeService { List search(ConsumeDetail consumeDetail); PageInfo searchForPage(Integer pageNum, Integer pageSize, ConsumeDetail consumeDetail); - SumConsume getSumConsume(ConsumeDetail consumeDetail); + SumConsume getSumConsume(SumConsume sumConsume); } diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index df5268b..aa725d4 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/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"> - 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 - // `detail_flag`=1 AND update_type = '1' - update_type=1 - and detail_y.jwcode =#{jwcode} + update_type = '1' + and detail_y.jwcode =#{jwcode} and product.name = #{productName} and detail_y.consume_platform=#{consumePlatform} and detail_y.consume_type= #{consumeType} diff --git a/src/main/resources/mapper/DetailYMapper.xml b/src/main/resources/mapper/DetailYMapper.xml index db7db2a..9d3dff0 100644 --- a/src/main/resources/mapper/DetailYMapper.xml +++ b/src/main/resources/mapper/DetailYMapper.xml @@ -50,4 +50,13 @@ + + \ No newline at end of file