From 24b31976dc47005bf93bbefca97ff91e8be3a5d7 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Fri, 21 Nov 2025 15:38:42 +0800 Subject: [PATCH] =?UTF-8?q?11-21=20=E5=B0=8F=E9=BB=84=E8=BD=A6=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=9C=AA=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/domain/vo/bean/BeanConsumeCart.java | 13 +++++++------ .../com/example/demo/domain/vo/bean/BeanConsumeCartVo.java | 5 +++-- .../com/example/demo/mapper/bean/BeanConsumeMapper.java | 3 +-- .../com/example/demo/mapper/coin/BeanRechargeMapper1.java | 7 ++++++- .../demo/serviceImpl/bean/BeanConsumeServiceImpl.java | 5 ++++- src/main/resources/jindouMapper/BeanConsumeMapper.xml | 9 +-------- src/main/resources/mapper/BeanRechargeMapper1.xml | 10 ++++++++++ 7 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java index 001c213..c56fc64 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java @@ -2,6 +2,7 @@ package com.example.demo.domain.vo.bean; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.netty.util.collection.LongObjectHashMap; import lombok.Data; import lombok.NoArgsConstructor; @@ -54,10 +55,10 @@ public class BeanConsumeCart { private String transactionNo; // 备用交易号 private Integer productVersion; // 1半年 2终免 private Integer autoUpdate; // 是否同步过 0否 1是 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime createdAt; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime updatedAt; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime tradeTime; // 支付成功时间 + + private Long createdAt; + + private Long updatedAt; + + private Long tradeTime; // 支付成功时间 } diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java index 59ca15b..4cac6f4 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java @@ -29,6 +29,7 @@ public class BeanConsumeCartVo { private BigDecimal totalMoney; // 应付金额 private String liveName; // 直播间名称 private String sourceName; // 班级或频道名称 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private LocalDateTime tradeTime; // 支付成功时间 + + private Long tradeTime; // 支付成功时间 + private Long createdAt; // 创建时间 } diff --git a/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java b/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java index 85fc522..ed57e17 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java @@ -25,8 +25,7 @@ public interface BeanConsumeMapper { List selectFanBy(@Param("beanConsumeFan") BeanConsumeFan beanConsumeFan); //筛选查询文章消费 List selectArticleBy(@Param("beanConsumeArticle") BeanConsumeArticle beanConsumeArticle); - //筛选查询小黄车消费 - List selectCartBy(BeanConsumeCart beanConsumeCart); + //查询金豆直播消费金额 BeanConsumeGold selectSumLiveBy(@Param("beanConsumeLive") BeanConsumeLive beanConsumeLive); //查询金豆铁粉消费金额 diff --git a/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java index f71216e..bf9b774 100644 --- a/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java +++ b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java @@ -1,9 +1,13 @@ package com.example.demo.mapper.coin; +import com.example.demo.domain.vo.bean.BeanConsumeCart; +import com.example.demo.domain.vo.bean.BeanConsumeCartVo; import com.example.demo.domain.vo.bean.BeanRecharge; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @program: gold-java * @ClassName BeanRechargeMapper @@ -15,6 +19,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface BeanRechargeMapper1 { - + //筛选查询小黄车消费 + List selectCartBy(BeanConsumeCart beanConsumeCart); int add(BeanRecharge recharge); } \ No newline at end of file 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 7724a65..421ce42 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -5,6 +5,7 @@ import com.example.demo.domain.vo.bean.*; import com.example.demo.domain.vo.coin.*; import com.example.demo.mapper.bean.BeanConsumeMapper; import com.example.demo.mapper.bean.BeanUserMapper; +import com.example.demo.mapper.coin.BeanRechargeMapper1; import com.example.demo.mapper.coin.UserMapper; import com.example.demo.mapper.live.LiveMapper; import com.example.demo.service.bean.BeanConsumeService; @@ -42,6 +43,8 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { @Autowired private LiveMapper liveMapper; @Autowired + private BeanRechargeMapper1 beanRechargeMapper1; + @Autowired private UserMapper userMapper; @Autowired private RestTemplate restTemplate; @@ -176,7 +179,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { @Override public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { PageHelper.startPage(pageNum, pageSize); - List beanConsumeCarts = beanConsumeMapper.selectCartBy(beanConsumeCart); + List beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCart); return new PageInfo<>(beanConsumeCarts); } @Override diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index be802d3..ae57d52 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -329,14 +329,7 @@ ) as t - - + diff --git a/src/main/resources/mapper/BeanRechargeMapper1.xml b/src/main/resources/mapper/BeanRechargeMapper1.xml index 8fd108d..fc1c229 100644 --- a/src/main/resources/mapper/BeanRechargeMapper1.xml +++ b/src/main/resources/mapper/BeanRechargeMapper1.xml @@ -25,4 +25,14 @@ 0 + + + \ No newline at end of file