From 694d0d8620c3bd77ac9868cccd5efb7371376849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 11 Jul 2024 17:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A2=9E=E5=8A=A0=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/artificer/OrdersDao.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml
index 6c03576..86361de 100644
--- a/src/main/resources/mapper/artificer/OrdersDao.xml
+++ b/src/main/resources/mapper/artificer/OrdersDao.xml
@@ -804,6 +804,11 @@
 
     <select id="selectDividedIntoDetails" resultType="com.sqx.modules.artificer.entity.Orders">
         select o.*,
+        (
+        (case when o.is_supplement in (1,3,4) then 0 else o.price end) + ifnull(o.add_price,0)
+        + ifnull((case when o2.is_supplement in (1,3,4) then 0 else o2.price end),0) + ifnull(o2.add_price,0)
+        + ifnull((case when o3.is_supplement in (1,3,4) then 0 else o3.price end),0) + ifnull(o3.add_price,0)
+        ) as price_total,
         (case when o.user_package_detail_id is null then m.title else bl.title end ) as title,
         (case when o.user_package_detail_id is null then m.massage_img else bl.massage_img end ) as massageImg,
         (case when o.status = 4
@@ -834,6 +839,7 @@
             and o.status in (3,5)
         union all
         select o.*,
+        o.price + ifnull(o.add_price,0) as price_total,
         (case when o.user_package_detail_id is null then m.title else bl.title end ) as title,
         (case when o.user_package_detail_id is null then m.massage_img else bl.massage_img end ) as massageImg,
         o.artificer_money + ifnull(o.add_artificer_money,0) as artificer_money_total