From 49abad9488c128b90bfc1d38b96bde793558fb45 Mon Sep 17 00:00:00 2001
From: Derran <zhangpengjie@qniao.cn>
Date: Mon, 29 Apr 2024 16:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../walletaccount/constant/TradeTypeEnum.java   | 17 +++++++++--------
 .../user/WalletAccountUserQueryController.java  |  2 +-
 .../walletaccount/WalletAccountViewMapper.xml   |  1 +
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/walletaccount/constant/TradeTypeEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/walletaccount/constant/TradeTypeEnum.java
index 71942e9..6a3446b 100644
--- a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/walletaccount/constant/TradeTypeEnum.java
+++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/walletaccount/constant/TradeTypeEnum.java
@@ -10,14 +10,15 @@ import lombok.Getter;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum TradeTypeEnum {
 
-    /**
-     * 红娘
-     */
-    MATCHMAKER_JOIN_RECOMMEND_FEE(1, "红娘入驻推荐奖励"),
-    /**
-     * 平台
-     */
-    PLATFORM_SERVICE_FEE(2, "平台服务费");
+    GUEST_CERTIFICATION_FEE(101, "嘉宾实名认证"),
+
+    PUBLISH_MARRIAGE_BOUNTY_FEE(102, "发布悬赏招亲"),
+
+    MATCH_MARRIAGE_BOUNTY_FEE(103, "匹配悬赏招亲"),
+
+    MATCHMAKER_JOIN_RECOMMEND_FEE(104, "红娘入驻推荐"),
+
+    PLATFORM_SERVICE_FEE(201, "平台服务费");
 
     @EnumValue
     @JsonValue
diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java
index cb6cf99..2ae2fbe 100644
--- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java
+++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/walletaccount/user/WalletAccountUserQueryController.java
@@ -34,7 +34,7 @@ public class WalletAccountUserQueryController {
         return vo;
     }
 
-    @GetMapping("get/wallet-account-record/page")
+    @GetMapping("page/wallet-account-record")
     @ApiOperation("用户获取钱包账号记录")
     public QnPage<UserGetWalletAccountRecordVo> userPageWalletAccountRecord(@RequestParam("userId") Long userId,
                                                                             PageUtil pageUtil,
diff --git a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
index ef1de56..a3057cf 100644
--- a/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
+++ b/dating-agency-mall-server/src/main/resources/mapper/walletaccount/WalletAccountViewMapper.xml
@@ -6,6 +6,7 @@
     <select id="pageWalletAccountRecord"
             resultType="com.qniao.dam.api.query.walletaccount.user.response.UserGetWalletAccountRecordVo">
         SELECT
+            dwar.id,
             dwar.create_time,
             dwar.wallet_account_id,
             dwar.trade_type,