From 6387f004d398566287c569d9da187071f7c20155 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 20 Nov 2025 17:47:35 +0800 Subject: [PATCH] =?UTF-8?q?11-20=20=E5=9C=B0=E5=8C=BA=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=87=B3=E6=AD=A3=E7=A1=AE=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=94=B6=E6=AC=BE=E5=9C=B0=E5=8C=BA=E6=88=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=9C=B0=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/domain/entity/BeanConsumeCart.java | 63 ++++++++++++++++++++++ .../demo/domain/vo/bean/BeanConsumeCartVo.java | 34 ++++++++++++ .../demo/mapper/bean/BeanConsumeMapper.java | 2 + .../serviceImpl/bean/BeanConsumeServiceImpl.java | 4 +- .../cash/CashCollectionServiceImpl.java | 8 +-- .../resources/cashMapper/CashCollectionMapper.xml | 2 +- .../resources/jindouMapper/BeanConsumeMapper.xml | 7 ++- 7 files changed, 112 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/entity/BeanConsumeCart.java create mode 100644 src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java diff --git a/src/main/java/com/example/demo/domain/entity/BeanConsumeCart.java b/src/main/java/com/example/demo/domain/entity/BeanConsumeCart.java new file mode 100644 index 0000000..d90c4c2 --- /dev/null +++ b/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; // 支付成功时间 +} 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 new file mode 100644 index 0000000..59ca15b --- /dev/null +++ b/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; // 支付成功时间 +} 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 701e48e..85fc522 100644 --- a/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/bean/BeanConsumeMapper.java @@ -25,6 +25,8 @@ 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/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index 4e1ecfc..7724a65 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/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 beanConsumeCarts = beanConsumeMapper.selectCartBy(beanConsumeCart); + return new PageInfo<>(beanConsumeCarts); } @Override public BeanConsumeGold sumConsumeGold(Page page) { diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index b1c1ce5..fbac154 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/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通过时，按收款地区筛选 - /* if (cashCollection.getStatus() == 13) { - cashCollection.setSubmitterMarket(null); + //状态为已通过和Link通过时，满足收款地区或提交人地区即可 + /* if (cashCollection.getStatus() == 13) { + cashCollection.setSubmitterId(null); }*/ - //状态为1346，已通过和已退款，满足收款地区或提交人地区即可， + //状态为13 或46，已通过或已完成和已退款，满足收款地区或提交人地区即可， cashCollection.setSubmitterId(null); diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index db535c1..020aeb1 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -145,7 +145,7 @@ - + AND (cr.received_market = #{cashCollection.receivedMarket} diff --git a/src/main/resources/jindouMapper/BeanConsumeMapper.xml b/src/main/resources/jindouMapper/BeanConsumeMapper.xml index 8bb547e..1fbafa8 100644 --- a/src/main/resources/jindouMapper/BeanConsumeMapper.xml +++ b/src/main/resources/jindouMapper/BeanConsumeMapper.xml @@ -329,6 +329,12 @@ ) as t + + + - \ No newline at end of file