11-21 小黄车消费记录，未筛选

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;  // 支付成功时间
 }

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;  // 创建时间
 }

src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java

@@ -25,8 +25,7 @@ public interface BeanConsumeMapper {
     List<BeanConsumeFan> selectFanBy(@Param("beanConsumeFan") BeanConsumeFan beanConsumeFan);
     //筛选查询文章消费
     List<BeanConsumeArticle> selectArticleBy(@Param("beanConsumeArticle") BeanConsumeArticle beanConsumeArticle);
-    //筛选查询小黄车消费
-    List<BeanConsumeCartVo> selectCartBy(BeanConsumeCart beanConsumeCart);
+
     //查询金豆直播消费金额
     BeanConsumeGold selectSumLiveBy(@Param("beanConsumeLive") BeanConsumeLive beanConsumeLive);
     //查询金豆铁粉消费金额

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<BeanConsumeCartVo> selectCartBy(BeanConsumeCart beanConsumeCart);
     int add(BeanRecharge recharge);
 }

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<BeanConsumeCartVo> beanConsumeCarts = beanConsumeMapper.selectCartBy(beanConsumeCart);
+        List<BeanConsumeCartVo> beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCart);
         return new PageInfo<>(beanConsumeCarts);
     }
     @Override

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -329,14 +329,7 @@
         </choose>
         ) as t
     </select>
-    <!--筛选查询小黄车消费数据-->
-    <select id="selectCartBy" resultType="com.example.demo.domain.vo.bean.BeanConsumeCartVo">
-        select
-            co.nickname,co.jwcode,m.name AS market,co.product_id,co.total_money,co.live_name,co.source_name,co.trade_time
-        from cart_order co
-        left join user u on u.jwcode = co.jwcode
-        left join market m on m.id = u.market
-    </select>
+
 
 
     <!--获取直播礼物-->

src/main/resources/mapper/BeanRechargeMapper1.xml

@@ -25,4 +25,14 @@
             0
         </trim>
     </insert>
+
+    <!--筛选查询小黄车消费数据-->
+    <select id="selectCartBy" resultType="com.example.demo.domain.vo.bean.BeanConsumeCartVo">
+        select
+            co.nickname,co.jwcode,m.name AS market,pd.name AS productName,co.total_money,co.live_name,co.source_name,co.created_at
+        from cart_order co
+                 left join user u on u.jwcode = co.jwcode
+                 left join market m on m.id = u.market
+                 left join product_dict pd on pd.id = co.product_id
+    </select>
 </mapper>