From 1a50940fde9a815d1dbddfe8e5f4da22641ad93b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 11:15:55 +0800
Subject: [PATCH] fix orderList

---
 src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java                         |    3 +++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 ++
 src/main/resources/mapper/modules/MallOrderInfoMapper.xml                       |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
index 401d64d..d0907cb 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -23,4 +23,7 @@
 
     @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
     private Integer status;
+
+    @ApiModelProperty(hidden = true)
+    private Long memberId;
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 55c6764..22fbcc3 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -204,8 +204,10 @@
 
     @Override
     public List<OrderListVo> findOrderList(OrderListDto orderListDto) {
+        MallMember member = LoginUserUtil.getLoginUser();
         IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
 
+        orderListDto.setMemberId(member.getId());
         IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
         return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
     }
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index a519661..85d9104 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -96,6 +96,9 @@
             <if test="record.status != 4 and record.status != 0">
                 and a.status = #{record.status}
             </if>
+            <if test="record.memberId != null">
+                and a.member_id=#{record.memberId}
+            </if>
         </where>
         order by a.created_time desc
     </select>

--
Gitblit v1.9.1