From d9619e6feae4307126a5cd4596f5a7317349d350 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 31 Mar 2025 17:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=86=85=E5=AE=B9=E3=80=81=E6=B7=BB=E5=8A=A0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7UID=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/pc/order/req/OrderReqQuery.java     |  1 +
 .../model/pc/order/resp/OrderRespVO.java      |  3 +++
 .../service/pc/impl/OrderServiceImpl.java     | 25 +++++++++++++++++++
 src/main/resources/mapper/OrderMapper.xml     | 19 +++++++++++---
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
index bbd2daa..3ab1e1d 100644
--- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
+++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
@@ -23,6 +23,7 @@ public class OrderReqQuery extends BaseQueryParameterReq {
     private Long memberId;
     @ApiModelProperty("用户昵称")
     private String memberNickname;
+    private String memberUid;
     @ApiModelProperty("用户真实名称")
     private String memberRealName;
     /**
diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java
index eb9f669..deae348 100644
--- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java
+++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderRespVO.java
@@ -22,8 +22,11 @@ public class OrderRespVO {
     private Long faceId;
     private String faceUrl;
     private Integer type;
+    private String orderType;
+    private String goodsName;
     @ApiModelProperty("用户昵称")
     private String memberNickname;
+    private String memberUid;
     @ApiModelProperty("用户真实名称")
     private String memberRealName;
     /**
diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index 648a776..b4c2093 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -94,6 +94,31 @@ public class OrderServiceImpl implements OrderService {
     public ApiResponse<PageInfo<OrderRespVO>> pageQuery(OrderReqQuery query) {
         PageHelper.startPage(query.getPageNum(), query.getPageSize());
         List<OrderRespVO> list = orderMapper.list(query);
+        list.forEach(item -> {
+            if (Integer.valueOf(-1).equals(item.getType())) {
+                item.setGoodsName("一口价");
+                item.setOrderType("一口价");
+            } else if (Integer.valueOf(0).equals(item.getType())) {
+                // 单品，查询
+                OrderAppRespVO orderAppRespVO = orderMapper.appDetail(item.getId());
+                List<OrderItemVO> orderItemList = orderAppRespVO.getOrderItemList();
+                if (!orderItemList.isEmpty()) {
+                    if (Integer.valueOf(1).equals(orderItemList.get(0).getGoodsType())) {
+                        item.setGoodsName("录像集");
+                        item.setOrderType("录像集");
+                    } else if (Integer.valueOf(2).equals(orderItemList.get(0).getGoodsType())) {
+                        item.setGoodsName("照片集");
+                        item.setOrderType("照片集");
+                    } else if (Integer.valueOf(0).equals(orderItemList.get(0).getGoodsType())) {
+                        item.setOrderType("旅行Vlog");
+                        item.setGoodsName(orderItemList.get(0).getGoodsName());
+                    } else {
+                        item.setGoodsName("未知商品");
+                        item.setOrderType("未知商品");
+                    }
+                }
+            }
+        });
         PageInfo<OrderRespVO> pageInfo = new PageInfo<>(list);
         return ApiResponse.success(pageInfo);
     }
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index b75cd8f..4617833 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -7,6 +7,7 @@
         <result column="scenic_name" property="scenicName"/>
         <result column="member_id" property="memberId"/>
         <result column="nickname" property="memberNickname"/>
+        <result column="uid" property="memberUid"/>
         <result column="real_name" property="memberRealName"/>
         <result column="openid" property="openId"/>
         <result column="price" property="price"/>
@@ -30,6 +31,7 @@
         <result column="scenic_name" property="scenicName"/>
         <result column="member_id" property="memberId"/>
         <result column="nickname" property="memberNickname"/>
+        <result column="uid" property="memberUid"/>
         <result column="real_name" property="memberRealName"/>
         <result column="openid" property="openId"/>
         <result column="price" property="price"/>
@@ -227,7 +229,7 @@
         delete from `order` where id = #{id}
     </delete>
     <select id="list" resultMap="PCBaseResultListMap">
-        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname, m.uid,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
                o.coupon_price,
                refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
@@ -244,6 +246,9 @@
             <if test="memberNickname!= null and memberNickname!=''">
                 and m.nickname like concat('%',#{memberNickname},'%')
             </if>
+            <if test="memberUid!= null">
+                and m.uid = #{memberUid}
+            </if>
             <if test="memberRealName!= null and memberRealName!=''">
                 and m.real_name like concat('%',#{memberRealName},'%')
             </if>
@@ -299,7 +304,7 @@
         order by o.create_at desc
     </select>
     <select id="listDetail" resultMap="PCBaseResultMap">
-        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname, m.uid,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
         o.coupon_price,
         refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
@@ -316,6 +321,9 @@
             <if test="memberNickname!= null and memberNickname!=''">
                 and m.nickname like concat('%',#{memberNickname},'%')
             </if>
+            <if test="memberUid!= null">
+                and m.uid = #{memberUid}
+            </if>
             <if test="memberRealName!= null and memberRealName!=''">
                 and m.real_name like concat('%',#{memberRealName},'%')
             </if>
@@ -374,7 +382,7 @@
         select o.id, o.scenic_id, s.name as scenic_name, o.member_id, o.type, o.openid, o.face_id, f.face_url, o.price, o.pay_price, o.remark, o.broker_id, o.promo_code, o.refund_reason,
                o.coupon_price,
                o.refund_status, o.status, o.create_at, o.update_at, o.pay_at, o.cancel_at, o.refund_at,
-               m.nickname , m.real_name
+               m.nickname, m.uid , m.real_name
             from `order` o
         left join face f on o.face_id = f.id
         left join member m on m.id = o.member_id
@@ -412,7 +420,7 @@
         where o.id = #{id}
     </select>
     <select id="refundList" resultType="com.ycwl.basic.model.pc.order.resp.OrderRespVO">
-        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname,m.uid ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
         refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
         left join member m on o.member_id = m.id
@@ -428,6 +436,9 @@
             <if test="memberNickname!= null and memberNickname!=''">
                 and m.nickname like concat('%',#{memberNickname},'%')
             </if>
+            <if test="memberUid!= null">
+                and m.uid = #{memberUid}
+            </if>
             <if test="memberRealName!= null and memberRealName!=''">
                 and m.real_name like concat('%',#{memberRealName},'%')
             </if>