From 6e4b9a3b2df93ea6df1d22c46405aaed31e1eefb Mon Sep 17 00:00:00 2001 From: lijianlin Date: Sat, 29 Nov 2025 15:04:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?11-29=20=E5=B0=8F=E9=BB=84=E8=BD=A6?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=95=B0=E6=8D=AE=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/Export/ExportServiceImpl.java | 2 +- .../java/com/example/demo/controller/bean/BeanConsumeController.java | 5 +++++ src/main/resources/mapper/BeanRechargeMapper1.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index e86d041..66c7797 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -306,7 +306,7 @@ public class ExportServiceImpl implements ExportService { @Override public Result addExportLive(LiveDTO dto) { - return addExport(dto, "直播明细", "lives:queue:export_queue", "beanConsumeLive"); + return addExport(dto, "打赏明细", "lives:queue:export_queue", "beanConsumeLive"); } @Override diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index 3506db5..aa8d631 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -1,5 +1,6 @@ package com.example.demo.controller.bean; +import com.example.demo.config.interfac.Log; import com.example.demo.domain.vo.bean.BeanConsume; import com.example.demo.domain.vo.bean.BeanConsumeGold; import com.example.demo.domain.vo.bean.BeanRecharge; @@ -58,6 +59,7 @@ public class BeanConsumeController { } } //筛选查询直播消费记录 + @Log("查询直播消费记录") @PostMapping("/selectLiveBy") public Result selectLiveBy(@RequestBody Page page){ try { @@ -76,6 +78,7 @@ public class BeanConsumeController { return Result.error(e.toString()); }} //筛选查询铁粉消费记录 + @Log("查询铁粉消费记录") @PostMapping("/selectFanBy") public Result selectFanBy(@RequestBody Page page){ try { @@ -94,6 +97,7 @@ public class BeanConsumeController { }} //筛选查询文章消费记录 + @Log("查询文章消费记录") @PostMapping("/selectArticleBy") public Result selectArticleBy(@RequestBody Page page){ try { @@ -112,6 +116,7 @@ public class BeanConsumeController { }} //筛选查询小黄车消费记录 + @Log("查询小黄车消费记录") @PostMapping("/selectCartBy") public Result selectCartBy(@RequestBody Page page){ try { diff --git a/src/main/resources/mapper/BeanRechargeMapper1.xml b/src/main/resources/mapper/BeanRechargeMapper1.xml index 569ea3f..587c7ea 100644 --- a/src/main/resources/mapper/BeanRechargeMapper1.xml +++ b/src/main/resources/mapper/BeanRechargeMapper1.xml @@ -30,7 +30,7 @@ - SELECT ugr.*, + SELECT ugr.id,ugr.order_code,ugr.jwcode,ugr.activity, + ugr.rate_id,ugr.money,ugr.sum_gold,ugr.permanent_gold,ugr.free_june,ugr.free_december, + ugr.task_gold,ugr.remark,ugr.pay_model,ugr.pay_platform,ugr.voucher, + ugr.goods_name,ugr.type,ugr.is_refund,ugr.admin_id,ugr.audit_id, + ugr.audit_status,ugr.reject_reason,ugr.pay_time, + ugr.create_time,ugr.audit_time,ugr.update_time, (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, u.name as name, m.name as market, @@ -63,12 +68,18 @@ AND ugr.activity = #{rechargeAudit.activity} - + + + AND u.market IN + + #{market} + AND ugr.pay_model = #{rechargeAudit.payModel} @@ -77,7 +88,7 @@ AND ugr.rate_id = #{rechargeAudit.rateId} --> - AND m.name = #{rechargeAudit.market} + AND m.id = #{rechargeAudit.market} AND ugr.audit_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime} @@ -145,7 +156,7 @@ AND ugr.audit_time between #{refundAudit.startTime} and #{refundAudit.endTime} - AND m.name = #{refundAudit.market} + AND m.id = #{refundAudit.market} From 100cacf53c8c93e02540c55bd7691fa566049682 Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 2 Dec 2025 09:43:22 +0800 Subject: [PATCH 6/6] =?UTF-8?q?12-01=20=E7=BA=BF=E4=B8=8A=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5=EF=BC=8C=E8=A1=A5=E5=85=85=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/entity/CashRecord.java | 1 + src/main/java/com/example/demo/domain/entity/GOrder.java | 2 ++ .../example/demo/serviceImpl/cash/CashCollectionServiceImpl.java | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/src/main/java/com/example/demo/domain/entity/CashRecord.java b/src/main/java/com/example/demo/domain/entity/CashRecord.java index c161eeb..a097493 100644 --- a/src/main/java/com/example/demo/domain/entity/CashRecord.java +++ b/src/main/java/com/example/demo/domain/entity/CashRecord.java @@ -39,6 +39,7 @@ public class CashRecord implements Serializable { private String NumUnit; // 数量单位 个/月/年 private Integer permanentGold; // 永久金币数量 private Integer freeGold; // 免费金币数量 + private String payload; //平台 // 金额信息 private String paymentCurrency; // 付款币种 diff --git a/src/main/java/com/example/demo/domain/entity/GOrder.java b/src/main/java/com/example/demo/domain/entity/GOrder.java index 3677adf..183b86e 100644 --- a/src/main/java/com/example/demo/domain/entity/GOrder.java +++ b/src/main/java/com/example/demo/domain/entity/GOrder.java @@ -33,4 +33,6 @@ public class GOrder { private Integer addTime; // 创建时间 private Integer updTime; // 更新时间 private Integer isSynced; // 0未同步 1已同步 + private String firstdataIpgTransactionId; // FirstData订单号 + } \ No newline at end of file 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 4431284..14df521 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -374,22 +374,28 @@ public User getNameAndMarket(Integer jwcode) { cashRecord.setPayType("IOS内购"); cashRecord.setBankCode(gOrder.getIosTransactionId()); cashRecord.setReceivedMarket("3"); + cashRecord.setPayload("IOS"); break; case 5: cashRecord.setPayType("Stripe-链接收款"); cashRecord.setReceivedMarket("13"); + cashRecord.setPayload("Stripe"); break; case 6: cashRecord.setPayType("PaymentAsia-链接收款"); cashRecord.setReceivedMarket("13"); + cashRecord.setPayload("PaymentAsia"); break; case 7: cashRecord.setPayType("Ipay88-链接收款"); cashRecord.setReceivedMarket("5"); + cashRecord.setPayload("Ipay88"); break; case 9: cashRecord.setPayType("FistData"); cashRecord.setReceivedMarket("4"); + cashRecord.setBankCode(gOrder.getFirstdataIpgTransactionId()); + cashRecord.setPayload("FistData"); break; default: break;