11-25 小黄车筛选查询

src/main/java/com/example/demo/controller/bean/BeanConsumeController.java

@@ -122,7 +122,7 @@ public class BeanConsumeController {
                 return Result.error("页大小为空！");
             } else {
 
-                return Result.success(beanConsumeService.selectCartBy(page.getPageNum(), page.getPageSize(), page.getBeanConsumeCart()));
+                return Result.success(beanConsumeService.selectCartBy(page.getPageNum(), page.getPageSize(), page.getBeanConsumeCartDTO()));
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java

@@ -0,0 +1,45 @@
+package com.example.demo.domain.DTO;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeCartDTO
+ * @description:
+ * @author: Ethan
+ * @create: 2025−11-25 09:59
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BeanConsumeCartDTO implements Serializable {
+    private Integer id;
+    private String nickname;          // 姓名
+    private Integer jwcode;           // 精网号
+  //  private Integer productId;        // 产品 ID
+    private String productName;       //产品名称
+    private String market;            //用户地区
+    //private BigDecimal totalMoney;    // 金额
+    private String liveName;          // 直播间名称
+    private String sourceName;        // 班级或频道名称
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    private Date endTime;
+    private Long createdAt;  // 创建时间
+    private String startAt; //时间戳开始时间
+    private String endAt;   //时间戳结束时间
+
+  private String sortField; //排序字段
+
+  private String sortOrder; //排序顺序
+}

src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java

@@ -5,8 +5,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @program: gold-java
@@ -19,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class BeanConsumeCartVo {
+public class BeanConsumeCartVo implements Serializable {
     private Integer id;
     private String nickname;          // 姓名
     private Integer jwcode;           // 精网号
@@ -29,7 +31,6 @@ public class BeanConsumeCartVo {
     private BigDecimal totalMoney;    // 应付金额
     private String liveName;          // 直播间名称
     private String sourceName;        // 班级或频道名称
-
-    private Long tradeTime;  // 支付成功时间
-    private Long createdAt;  // 创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdAt;  // 创建时间
 }

src/main/java/com/example/demo/domain/vo/coin/Page.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo.coin;
 
+import com.example.demo.domain.DTO.BeanConsumeCartDTO;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.cash.CashCollection;
@@ -37,6 +38,7 @@ public class Page {
     private BeanConsumeFan beanConsumeFan;      //铁粉金豆消费
     private BeanConsumeArticle beanConsumeArticle;  //文章金豆消费
     private BeanConsumeCart beanConsumeCart;    //小黄车金豆消费
+    private BeanConsumeCartDTO beanConsumeCartDTO;  //小黄车dto
     private BeanSystemRechargeInfo beanSystemRechargeInfo;  //金豆充值信息
     private BeanOnlineRechargeInfo beanOnlineRechargeInfo;  //金豆充值信息
     private BeanConsumeGold beanConsumeGold;    //金豆消费合计数
@@ -49,4 +51,5 @@ public class Page {
     private RechargeActivity rechargeActivity; //充值活动
     private CashRecordDTO cashRecordDTO;
 
+
 }

src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java

@@ -1,6 +1,7 @@
 package com.example.demo.mapper.coin;
 
 
+import com.example.demo.domain.DTO.BeanConsumeCartDTO;
 import com.example.demo.domain.vo.bean.BeanConsumeCart;
 import com.example.demo.domain.vo.bean.BeanConsumeCartVo;
 import com.example.demo.domain.vo.bean.BeanRecharge;
@@ -20,6 +21,6 @@ import java.util.List;
 @Mapper
 public interface BeanRechargeMapper1 {
     //筛选查询小黄车消费
-    List<BeanConsumeCartVo> selectCartBy(BeanConsumeCart beanConsumeCart);
+    List<BeanConsumeCartVo> selectCartBy(BeanConsumeCartDTO beanConsumeCartDTO);
     int add(BeanRecharge recharge);
 }

src/main/java/com/example/demo/service/bean/BeanConsumeService.java

@@ -1,5 +1,6 @@
 package com.example.demo.service.bean;
 
+import com.example.demo.domain.DTO.BeanConsumeCartDTO;
 import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.coin.Gold;
 import com.example.demo.domain.vo.coin.Page;
@@ -37,5 +38,5 @@ public interface BeanConsumeService {
     List<String> getLiveChannel();
 
     //筛选查询小黄车消费
-    Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart);
+    Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO);
 }

src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.example.demo.serviceImpl.bean;
 
 import com.example.demo.Util.BaseDES2;
+import com.example.demo.domain.DTO.BeanConsumeCartDTO;
 import com.example.demo.domain.vo.bean.*;
 import com.example.demo.domain.vo.coin.*;
 import com.example.demo.mapper.bean.BeanConsumeMapper;
@@ -195,9 +196,11 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     }
     //筛选查询小黄车消费
     @Override
-    public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) {
+    public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO) {
+
         PageHelper.startPage(pageNum, pageSize);     //必须要直接跟mapper
-        List<BeanConsumeCartVo> beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCart);
+        List<BeanConsumeCartVo> beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCartDTO);
+
         return new PageInfo<>(beanConsumeCarts);
     }
     @Override

src/main/resources/mapper/BeanRechargeMapper1.xml

@@ -29,10 +29,40 @@
     <!--筛选查询小黄车消费数据-->
     <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
+            co.id, co.nickname,co.jwcode,m.name AS market,pd.name AS productName,co.total_money,co.source_name,co.live_name, FROM_UNIXTIME(co.created_at) AS createdAt
         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
+        <where>
+            <if test="jwcode!= null and jwcode!=''">
+                and co.jwcode =#{jwcode}
+            </if>
+            <if test="market!= null and market!=''">
+                and m.name = #{market}
+            </if>
+            <if test="productName!= null and productName!=''">
+                and pd.name = #{productName}
+            </if>
+            <if test="liveName!= null and liveName!=''">
+                and co.live_name = #{liveName}
+            </if>
+            <if test="sourceName!= null and sourceName!=''">
+                and co.source_name = #{sourceName}
+            </if>
+            <if test="startAt!= null and startAt!='' and endAt!=null and endAt!=''">
+                and co.created_at between
+                UNIX_TIMESTAMP(#{beanConsumeCartDTO.startTime}) and
+                UNIX_TIMESTAMP(#{beanConsumeCartDTO.endTime})
+            </if>
+        </where>
+        <choose>
+            <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                ORDER BY ${sortField} ${sortOrder}
+            </when>
+            <otherwise>
+                ORDER BY created_at DESC
+            </otherwise>
+        </choose>
     </select>
 </mapper>