From 6c75b0c0fd6862b0d10793821db7017341a6a771 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 18 Aug 2023 16:48:31 +0800
Subject: [PATCH] 后台修改

---
 src/main/resources/mapper/dapp/MallGoodsMapper.xml |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/dapp/MallGoodsMapper.xml b/src/main/resources/mapper/dapp/MallGoodsMapper.xml
index a14017c..6e1906c 100644
--- a/src/main/resources/mapper/dapp/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/dapp/MallGoodsMapper.xml
@@ -4,8 +4,10 @@
 
     <select id="selectMallGoodsInPage" resultType="cc.mrbird.febs.dapp.entity.MallGoods">
         select
-        a.*
+        a.*,
+        b.name categoryName
         from mall_goods a
+        left join mall_goods_category b on a.category_id = b.id
         <where>
             <if test="record != null">
                 <if test="record.goodsName != null and record.goodsName != ''">
@@ -55,14 +57,17 @@
                 <if test="record.goodsName != null and record.goodsName != ''">
                     and c.goods_name like CONCAT('%', CONCAT(#{record.goodsName}, '%'))
                 </if>
-                <if test="record.payResult != null and record.payResult != ''">
-                    and a.pay_result = #{record.payResult}
+                <if test="record.deliverType != null and record.deliverType != ''">
+                    and a.deliver_type = #{record.deliverType}
                 </if>
                 <if test="record.orderType != null">
                     and a.order_type = #{record.orderType}
                 </if>
                 <if test="record.status != null and record.status != ''">
                     and a.status = #{record.status}
+                </if>
+                <if test="record.deliverState != null and record.deliverState != ''">
+                    and a.deliver_state = #{record.deliverState}
                 </if>
                 <if test="record.orderNo != null and record.orderNo != ''">
                     and a.order_no like CONCAT('%', CONCAT(#{record.orderNo}, '%'))
@@ -85,4 +90,9 @@
         select * from mall_goods a where a.category_id = #{categaryId}
     </select>
 
+    <select id="getMallOrderInfoById" resultType="cc.mrbird.febs.dapp.vo.AdminMallOrderVo">
+        select b.* from mall_address_info b
+        where b.id = (select a.address_id from mall_order_info a where a.id = #{id})
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1