From 54a084af6bfc0eb1737bec9c962e4067d6cd1b3a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:22:35 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index f073cf6..c29fbfb 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -14,7 +14,7 @@
a.remark remark,
b.nick_name name,
b.mobile_phone mobilePhone,
- (select ifnull(sum(price),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
d.username username
FROM
xzx_jhy_order a
@@ -47,7 +47,7 @@
SELECT
a.id id,
a.order_no orderNo,
- b.nick_name name,
+ b.nick_name nickName,
b.mobile_phone mobilePhone,
a.area area,
a.address address,
@@ -58,7 +58,7 @@
d.mobile mobile,
date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
a.remark remark,
- a.comment comment,
+ a. COMMENT comments,
a.score score,
a.is_anonymous isAnonymous
FROM
--
Gitblit v1.9.1