11-20 地区财务，修复至正确查看收款地区或提交地区

src/main/java/com/example/demo/domain/entity/BeanConsumeCart.java

@@ -0,0 +1,63 @@
+package com.example.demo.domain.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeCart
+ * @description:
+ * @author: Ethan
+ * @create: 2025−11-20 10:28
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BeanConsumeCart {
+    private Integer id;
+    private String nickname;          // 姓名
+    private String phone;             // 电话
+    private Integer jwcode;           // 精网号
+    private Integer productId;        // 产品 ID
+    private BigDecimal totalMoney;    // 应付金额
+    private BigDecimal money;         // 实际付款金额
+    private BigDecimal coupon;        // 优惠券金额
+    private String tradeNo;           // 订单号
+    private Integer payWay;           // 1微信 2支付宝 3金币 4金豆
+    private Integer payType;          // 1一次支付 2多次支付
+    private String payAccount;        // 收款账户
+    private Integer pid;              // 关联的订单
+    private Integer type;             // 1全款 2定金 3尾款
+    private Integer state;            // 1新订单 2成功支付 3取消支付 4退款 5多笔支付支付进行中
+    private String liveName;          // 直播间名称
+    private Integer liveId;           // 直播间 id
+    private Integer channelId;        // 频道 id
+    private Integer classId;          // 班级 ID
+    private String sourceName;        // 班级或频道名称
+    private Integer platform;         // 1 app 2 h5
+    private Integer devicePlatform;   // 1 pc 2 手机
+    private String demo;              // 备用字段
+    private Integer from;             // 1直播间 2crm
+    private Integer teacherJwcode;    // 讲师标识
+    private String teacherName;       // 讲师名字
+    private String oaAccount;         // 班主任标识
+    private String oaName;            // 班主任名字
+    private String anchorMark;        // 号主标识
+    private String anchorName;        // 号主名称
+    private String transactionId;     // 支付成功第三方交易号
+    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;  // 支付成功时间
+}

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

@@ -0,0 +1,34 @@
+package com.example.demo.domain.vo.bean;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @program: gold-java
+ * @ClassName BeanConsumeCartVo
+ * @description:
+ * @author: Ethan
+ * @create: 2025−11-20 15:41
+ * @Version 1.0
+ **/
+@Data
+@NoArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class BeanConsumeCartVo {
+    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 LocalDateTime tradeTime;  // 支付成功时间
+}

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

@@ -25,6 +25,8 @@ 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/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -176,8 +176,8 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     @Override
     public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) {
         PageHelper.startPage(pageNum, pageSize);
-
-        return null;
+        List<BeanConsumeCartVo> beanConsumeCarts = beanConsumeMapper.selectCartBy(beanConsumeCart);
+        return new PageInfo<>(beanConsumeCarts);
     }
     @Override
     public BeanConsumeGold sumConsumeGold(Page page) {

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -260,11 +260,11 @@ public class CashCollectionServiceImpl implements CashCollectionService {
             if (cashCollection.getStatus() == 0 || cashCollection.getStatus() == 2) {
                 cashCollection.setReceivedMarket(null);
             }
-            //状态为已通过和Link通过时，按收款地区筛选
+            //状态为已通过和Link通过时，满足收款地区或提交人地区即可
           /*  if (cashCollection.getStatus() == 13) {
-                cashCollection.setSubmitterMarket(null);
+                cashCollection.setSubmitterId(null);
             }*/
-            //状态为1346，已通过和已退款，满足收款地区或提交人地区即可，
+            //状态为13 或46，已通过或已完成和已退款，满足收款地区或提交人地区即可，
             cashCollection.setSubmitterId(null);
 
 

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -145,7 +145,7 @@
         </if>
             <!-- 其他原有条件不变 -->
             <choose>
-                <when test="cashCollection.status != null and cashCollection.status == 46">
+                <when test="cashCollection.status != null and (cashCollection.status == 46||cashCollection.status == 13)">
                     <if test="cashCollection.receivedMarket != null and cashCollection.receivedMarket != ''">
                         AND (cr.received_market = #{cashCollection.receivedMarket}
                         <if test="cashCollection.submitterMarket != null and cashCollection.submitterMarket != ''">

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -329,6 +329,12 @@
         </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
+    </select>
+
 
     <!--获取直播礼物-->
     <select id="getLiveGift" resultType="java.lang.String">
@@ -354,5 +360,4 @@
           AND content IS NOT NULL AND pay_type in (1,2,3,4,5)
     </select>
 
-
 </mapper>