From 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 21 Jul 2021 11:24:30 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index b0b9877..b141ed5 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -401,9 +401,9 @@
'1' type,
ifnull(sum(d.money), 0) money,
'0' score,
- a.address address,
+ CONCAT(a.address_area, a.address) address,
ifnull(sum(d.weight), 0) weight,
- e.NAME NAME,
+ e.NAME name,
a.create_time createTime
FROM
xzx_order_info a
@@ -423,13 +423,14 @@
'2' type,
'0' money,
ifnull(sum(d.score), 0) score,
- a.address address,
+ CONCAT(a.area, a.address) address,
ifnull(sum(d.weight), 0) weight,
- a.username NAME,
+ e.username name,
a.CREATED_TIME createTime
FROM
xzx_jhy_order a
LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
+ LEFT JOIN xzx_jhy_info e ON a.jhy_id = e.user_id
WHERE
a.user_id = #{userId}
and a.status = 3
--
Gitblit v1.9.1