From 9f7d11df8c82fedb6bb2c83f99b52da08e75de3c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 03 Jul 2021 17:55:21 +0800
Subject: [PATCH] fix shoporder

---
 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml |    9 ++++++---
 1 files changed, 6 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 a0f17dc..1dd0fa0 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,9 +12,9 @@
         a.reserve_time reserveTime,
         a.status status,
         a.remark remark,
-        b.nick_name name,
+        a.username name,
         b.mobile_phone mobilePhone,
-               (select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+               (select ifnull(sum(score),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
                 (select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
         d.username username
         FROM
@@ -28,8 +28,11 @@
         <if test="record.status != null and record.status != ''">
             and a.status = #{record.status}
         </if>
+        <if test="record.jwyName != null and record.jwyName != ''">
+            and d.username like concat('%',#{record.jwyName},'%')
+        </if>
         <if test="record.account != null and record.account != ''">
-            and ( b.nick_name like concat('%',#{record.account},'%')
+            and ( a.username like concat('%',#{record.account},'%')
                       or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
         </if>
         <if test="record.reserveTimeStart != null">

--
Gitblit v1.9.1