From 0565955c4dbfdb6bc1afb715338940cbad535803 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Thu, 20 Nov 2025 15:37:26 +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=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5=E7=9C=8B=E5=88=B0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=BA=E6=8F=90=E4=BA=A4=E7=9A=84=E9=9D=9E?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=BA=E6=94=B6=E6=AC=BE=E7=9A=84=E5=B7=B2?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/domain/vo/bean/BeanConsumeCart.java | 51 ++++++++++++++++++++++ .../java/com/example/demo/domain/vo/coin/Page.java | 2 +- .../serviceImpl/bean/BeanConsumeServiceImpl.java | 12 ++--- .../cash/CashCollectionServiceImpl.java | 7 +-- 4 files changed, 63 insertions(+), 9 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 d4ca76b..001c213 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 @@ -1,5 +1,13 @@ 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 BeanConsumeCart @@ -8,5 +16,48 @@ package com.example.demo.domain.vo.bean; * @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/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index f8cd7c1..257764e 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -36,7 +36,7 @@ public class Page { private BeanConsumeLive beanConsumeLive; //直播金豆消费 private BeanConsumeFan beanConsumeFan; //铁粉金豆消费 private BeanConsumeArticle beanConsumeArticle; //文章金豆消费 - private BeanConsumeCart beanConsumeCart; + private BeanConsumeCart beanConsumeCart; //小黄车金豆消费 private BeanSystemRechargeInfo beanSystemRechargeInfo; //金豆充值信息 private BeanOnlineRechargeInfo beanOnlineRechargeInfo; //金豆充值信息 private BeanConsumeGold beanConsumeGold; //金豆消费合计数 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 5bc5375..4e1ecfc 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -172,7 +172,13 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { List beanConsumeArticles = beanConsumeMapper.selectArticleBy(beanConsumeArticle); return new PageInfo<>(beanConsumeArticles); } + //筛选查询小黄车消费 + @Override + public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { + PageHelper.startPage(pageNum, pageSize); + return null; + } @Override public BeanConsumeGold sumConsumeGold(Page page) { BeanConsumeGold gold = new BeanConsumeGold(); @@ -201,11 +207,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { public List getLiveChannel() { return liveMapper.getLiveChannel(); } - //筛选查询小黄车消费 - @Override - public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { - return null; - } + } 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 d9fb396..b1c1ce5 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -261,11 +261,12 @@ public class CashCollectionServiceImpl implements CashCollectionService { cashCollection.setReceivedMarket(null); } //状态为已通过和Link通过时，按收款地区筛选 - if (cashCollection.getStatus() == 13) { + /* if (cashCollection.getStatus() == 13) { cashCollection.setSubmitterMarket(null); - } + }*/ + //状态为1346，已通过和已退款，满足收款地区或提交人地区即可， cashCollection.setSubmitterId(null); - //状态为46，已通过和已退款，满足收款地区或提交人地区即可， + } if (cashCollection.getCashRoleId() == 0) {