From 0e31863e21d5fe074b479f10f359640a52c9dab7 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 18 Feb 2024 23:37:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=92=B1=E5=8C=85/=E5=82=A8=E5=80=BC?=
 =?UTF-8?q?=E5=8D=A1/=E7=8E=B0=E9=87=91=E6=B5=81=E6=B0=B4=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/channel/CashController.java    |  7 +++++
 .../controller/channel/WalletController.java  |  8 +++++-
 .../core/channel/cash/entity/CashRecord.java  | 10 +++----
 .../channel/voucher/entity/VoucherRecord.java |  5 ++++
 .../channel/wallet/convert/WalletConvert.java |  2 +-
 .../channel/wallet/entity/WalletRecord.java   |  6 +++-
 .../wallet/service/WalletRecordService.java   |  2 +-
 .../dto/channel/cash/CashRecordDto.java       | 28 +++++++++++++++++++
 .../channel/voucher/VoucherPayOrderDto.java   | 19 -------------
 .../dto/channel/voucher/VoucherRecordDto.java |  4 +++
 .../dto/channel/wallet/WalletPayOrderDto.java | 26 -----------------
 .../{wechat => wallet}/WalletRecordDto.java   |  6 +++-
 12 files changed, 67 insertions(+), 56 deletions(-)
 delete mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java
 delete mode 100644 daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java
 rename daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/{wechat => wallet}/WalletRecordDto.java (89%)

diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/CashController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/CashController.java
index 3b07390cb..9339c0ac5 100644
--- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/CashController.java
+++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/CashController.java
@@ -33,4 +33,11 @@ public class CashController {
     }
 
 
+    @Operation(summary = "查询记录详情")
+    @GetMapping("/findById")
+    public ResResult<CashRecordDto> findById(Long id){
+        return Res.ok(cashRecordService.findById(id));
+    }
+
+
 }
diff --git a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WalletController.java b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WalletController.java
index ac77cf986..c18c4b4fd 100644
--- a/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WalletController.java
+++ b/daxpay-single/daxpay-single-admin/src/main/java/cn/bootx/platform/daxpay/admin/controller/channel/WalletController.java
@@ -9,7 +9,7 @@ import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletQueryS
 import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletRecordService;
 import cn.bootx.platform.daxpay.service.core.channel.wallet.service.WalletService;
 import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto;
-import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
+import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
 import cn.bootx.platform.daxpay.service.param.channel.wallet.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -77,4 +77,10 @@ public class WalletController {
     public ResResult<PageResult<WalletRecordDto>> recordPage(PageParam pageParam, WalletRecordQuery query){
         return Res.ok(walletRecordService.page(pageParam, query));
     }
+
+    @Operation(summary = "查询记录详情")
+    @GetMapping("/record/findById")
+    public ResResult<WalletRecordDto> findRecordById(Long id){
+        return Res.ok(walletRecordService.findById(id));
+    }
 }
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java
index 10b1550b3..f1f3b4b46 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java
@@ -7,7 +7,6 @@ import cn.bootx.platform.daxpay.service.core.channel.cash.convert.CashPayConfigC
 import cn.bootx.platform.daxpay.service.dto.channel.cash.CashRecordDto;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
-import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,11 +22,6 @@ import lombok.experimental.Accessors;
 @DbTable(comment = "现金记录")
 public class CashRecord extends MpCreateEntity implements EntityBaseFunction<CashRecordDto> {
 
-    /** 储值卡id */
-    @DbMySqlIndex(comment = "储值卡ID")
-    @DbColumn(comment = "储值卡id")
-    private Long voucherId;
-
     /**
      * 业务类型
      * @see VoucherRecordTypeEnum
@@ -50,6 +44,10 @@ public class CashRecord extends MpCreateEntity implements EntityBaseFunction<Cas
     @DbColumn(comment = "终端ip")
     private String ip;
 
+    /** 备注 */
+    @DbColumn(comment = "备注")
+    private String remark;
+
     /**
      * 转换
      */
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java
index 64191d468..2a692aa31 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java
@@ -60,6 +60,11 @@ public class VoucherRecord extends MpCreateEntity implements EntityBaseFunction<
     @DbColumn(comment = "终端ip")
     private String ip;
 
+    /** 备注 */
+    @DbColumn(comment = "备注")
+    private String remark;
+
+
     /**
      * 转换
      */
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java
index fbafe7139..4e364931a 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java
@@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletRecord;
 import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletConfigDto;
 import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto;
 import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletLogDto;
-import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
+import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
 import cn.bootx.platform.daxpay.service.param.channel.wechat.WalletConfigParam;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java
index 7734ab31a..68ee81ace 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java
@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity;
 import cn.bootx.platform.daxpay.service.code.WalletRecordTypeEnum;
 import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert;
-import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
+import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
 import cn.bootx.table.modify.annotation.DbColumn;
 import cn.bootx.table.modify.annotation.DbTable;
 import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
@@ -60,6 +60,10 @@ public class WalletRecord extends MpCreateEntity implements EntityBaseFunction<W
     @DbColumn(comment = "终端ip")
     private String ip;
 
+    /** 备注 */
+    @DbColumn(comment = "备注")
+    private String remark;
+
     /**
      * 转换
      */
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletRecordService.java
index 0a9bf69c5..13a57c1fe 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletRecordService.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletRecordService.java
@@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletRecordManager;
 import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletRecord;
-import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
+import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
 import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletRecordQuery;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/cash/CashRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/cash/CashRecordDto.java
index 170332932..2e813ef86 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/cash/CashRecordDto.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/cash/CashRecordDto.java
@@ -1,6 +1,7 @@
 package cn.bootx.platform.daxpay.service.dto.channel.cash;
 
 import cn.bootx.platform.common.core.rest.dto.BaseDto;
+import cn.bootx.platform.daxpay.service.code.VoucherRecordTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -16,4 +17,31 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @Schema(title = "现金记录")
 public class CashRecordDto extends BaseDto {
+
+    /**
+     * 业务类型
+     * @see VoucherRecordTypeEnum
+     */
+    @Schema(description = "业务类型")
+    private String type;
+
+    /** 金额 */
+    @Schema(description = "金额")
+    private Integer amount;
+
+    /**
+     * 交易订单号
+     * 支付订单/退款订单
+     */
+    @Schema(description = "交易订单号")
+    private String orderId;
+
+    /** 终端ip */
+    @Schema(description = "终端ip")
+    private String ip;
+
+    /** 备注 */
+    @Schema(description = "备注")
+    private String remark;
+
 }
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java
deleted file mode 100644
index 8fe414e1f..000000000
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.bootx.platform.daxpay.service.dto.channel.voucher;
-
-import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @author xxm
- * @since 2022/3/14
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Accessors(chain = true)
-@Schema(title = "储值卡支付记录")
-public class VoucherPayOrderDto extends PayOrderDto {
-
-}
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherRecordDto.java
index 2e37169fc..2dcd329ea 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherRecordDto.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherRecordDto.java
@@ -51,4 +51,8 @@ public class VoucherRecordDto extends BaseDto {
     /** 终端ip */
     @Schema(description = "终端ip")
     private String ip;
+
+    /** 备注 */
+    @Schema(description = "备注")
+    private String remark;
 }
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java
deleted file mode 100644
index 60a5743cb..000000000
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.bootx.platform.daxpay.service.dto.channel.wallet;
-
-import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * @author xxm
- * @since 2020/12/8
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Accessors(chain = true)
-@Schema(title = "钱包支付记录")
-public class WalletPayOrderDto extends PayOrderDto implements Serializable {
-
-    private static final long serialVersionUID = 8238920331255597223L;
-
-    @Schema(description = "钱包ID")
-    private Long walletId;
-
-}
diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WalletRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java
similarity index 89%
rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WalletRecordDto.java
rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java
index a86f7c3ee..365385bcf 100644
--- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WalletRecordDto.java
+++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java
@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.service.dto.channel.wechat;
+package cn.bootx.platform.daxpay.service.dto.channel.wallet;
 
 import cn.bootx.platform.common.core.rest.dto.BaseDto;
 import cn.bootx.platform.daxpay.service.code.WalletRecordTypeEnum;
@@ -51,4 +51,8 @@ public class WalletRecordDto extends BaseDto {
     /** 终端ip */
     @Schema(description = "终端ip")
     private String ip;
+
+    /** 备注 */
+    @Schema(description = "备注")
+    private String remark;
 }