Compare commits
No commits in common. "91c52d90c49e5b5e0db8027c967c7ebd1cd68a6e" and "465231abfc8d6d7dcc56fa108dfcb2b10d3d18cd" have entirely different histories.
91c52d90c4
...
465231abfc
|
@ -804,11 +804,6 @@
|
||||||
|
|
||||||
<select id="selectDividedIntoDetails" resultType="com.sqx.modules.artificer.entity.Orders">
|
<select id="selectDividedIntoDetails" resultType="com.sqx.modules.artificer.entity.Orders">
|
||||||
select o.*,
|
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.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.user_package_detail_id is null then m.massage_img else bl.massage_img end ) as massageImg,
|
||||||
(case when o.status = 4
|
(case when o.status = 4
|
||||||
|
@ -839,7 +834,6 @@
|
||||||
and o.status in (3,5)
|
and o.status in (3,5)
|
||||||
union all
|
union all
|
||||||
select o.*,
|
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.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.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
|
o.artificer_money + ifnull(o.add_artificer_money,0) as artificer_money_total
|
||||||
|
|
Loading…
Reference in New Issue