From a57d34b9d5d0516efaecbd116456a800b8c9e046 Mon Sep 17 00:00:00 2001
From: sjl <15627915168@163.com>
Date: Fri, 5 Feb 2021 09:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=90=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=EF=BC=8C=E5=95=86=E5=93=81=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=92=8C=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=9C=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=91=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall4v/src/views/modules/order/order.vue                    | 4 +++-
 yami-shop-service/src/main/resources/mapper/OrderMapper.xml | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mall4v/src/views/modules/order/order.vue b/mall4v/src/views/modules/order/order.vue
index 5f2b60b..0f568e0 100644
--- a/mall4v/src/views/modules/order/order.vue
+++ b/mall4v/src/views/modules/order/order.vue
@@ -102,7 +102,9 @@
                       style="height: 100%;">
                 <div class="item">
                   <div>
-                    <span>{{order.payTypeName}}</span>
+                    <span v-if="order.payType === 1">微信支付</span>
+                    <span v-else-if="order.payType === 2">支付宝</span>
+                    <span v-else>手动代付</span>
                   </div>
                 </div>
               </el-col>
diff --git a/yami-shop-service/src/main/resources/mapper/OrderMapper.xml b/yami-shop-service/src/main/resources/mapper/OrderMapper.xml
index 435140c..6964db3 100644
--- a/yami-shop-service/src/main/resources/mapper/OrderMapper.xml
+++ b/yami-shop-service/src/main/resources/mapper/OrderMapper.xml
@@ -156,6 +156,7 @@
             <result column="sku_id" jdbcType="BIGINT" property="skuId"/>
             <result column="prod_count" jdbcType="INTEGER" property="prodCount"/>
             <result column="item_prod_name" jdbcType="VARCHAR" property="prodName"/>
+            <result column="item_sku_name" jdbcType="VARCHAR" property="skuName"/>
             <result column="pic" jdbcType="VARCHAR" property="pic"/>
             <result column="price" jdbcType="DECIMAL" property="price"/>
             <result column="user_id" jdbcType="VARCHAR" property="userId"/>
@@ -229,7 +230,7 @@
     </select>
 
     <select id="listOrdersDetialByOrderParam" resultMap="orderAndOrderItemAndUserAddrMap">
-        SELECT * FROM
+        SELECT *,oi.sku_name as item_sku_name,oi.prod_name as item_prod_name FROM
         (
         SELECT * FROM tz_order
         <where>