From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容

---
 meiya-rest/src/main/java/com/sinata/rest/modular/member/dao/mapping/MemMerchantMapper.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/dao/mapping/MemMerchantMapper.xml b/meiya-rest/src/main/java/com/sinata/rest/modular/member/dao/mapping/MemMerchantMapper.xml
index 010fc7d..d50dbed 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/dao/mapping/MemMerchantMapper.xml
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/member/dao/mapping/MemMerchantMapper.xml
@@ -126,15 +126,15 @@
         )
     </select>
 
-
-
     <select id="getMerchantOrderList" resultType="com.sinata.rest.modular.mall.controller.vo.VoMallOrder">
         SELECT
-        mo.order_no,mo.state,ms.goods_name,mo.goods_money,mo.use_user_id,md.goods_image goodsImage,md.use_time
+            mo.*,
+            md.goods_image goodsImage, md.use_time,
+            ms.goods_name
         FROM
-        mall_order mo
-        Left JOIN `mall_order_detail` md ON md.order_no = mo.order_no
-        Left JOIN mall_goods ms ON ms.id = md.goods_id
+            mall_order mo
+            Left JOIN `mall_order_detail` md ON md.order_no = mo.order_no
+            Left JOIN mall_goods ms ON ms.id = md.goods_id
         WHERE mo.is_delete = 0 and mo.state in (1,2,3)
         <if test="merchantId != null">
             and (mo.merchant_id =  #{merchantId})

--
Gitblit v1.7.1