From 861a96e12eba6e028cfefffbec2f3441e4c64714 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Fri, 19 Dec 2025 10:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AE=A1=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/market/vo/PpOrderListVO.java | 31 +++++++++++++++++++
 .../resources/mapper/PpPackageOrderMapper.xml |  6 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java
index 53e18a868..5890844fb 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -69,6 +70,36 @@ public class PpOrderListVO {
      */
     private BigDecimal price;
 
+    /**
+     * 最终支付金额
+     */
+    private BigDecimal finalPrice;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
+
+    /**
+     * 核销码
+     */
+    private String verifyCode;
+
+    /**
+     * 核销时间
+     */
+    private LocalDateTime verifyTime;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
     /**
      * 套餐图片
      */
diff --git a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
index c3924ffb0..baf07fbd3 100644
--- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
+++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml
@@ -6,13 +6,15 @@
 
     <select id="getOrderList" resultType="com.czg.market.vo.PpOrderListVO">
         SELECT
-          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status,
+          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status, o.final_price, o.pay_time, o.verify_code, o.verify_time,
           s.shop_name as shopName, s.address as shopAddress,
           p.origin_price as originPrice, p.price, p.images as imagesStr, p.tiered_discount as tieredDiscountStr,
-          p.expire_hours as expireHours, p.package_name as packageName
+          p.expire_hours as expireHours, p.package_name as packageName,
+          u.head_img as avatar, u.nick_name as nickname
         from pp_package_order o
         left join tb_shop_info s on o.shop_id = s.id
         left join pp_package p on o.package_id = p.id
+        left join tb_user_info u on o.user_id = u.id
         where 1=1
         <if test="shopId != null">
             and o.shop_id = #{shopId}