|
@@ -597,8 +597,11 @@
|
|
|
og.create_time as order_create_time,
|
|
|
og.service_start_time,
|
|
|
og.service_end_time,
|
|
|
- og.order_goods_id,
|
|
|
+ og.order_goods_id
|
|
|
+ <if test="querySign == null or querySign == '' or querySign == 0">
|
|
|
+ ,
|
|
|
(SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
|
|
|
+ </if>
|
|
|
FROM
|
|
|
goods g
|
|
|
LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
|
|
@@ -647,8 +650,11 @@
|
|
|
og.create_time as order_create_time,
|
|
|
og.service_start_time,
|
|
|
og.service_end_time,
|
|
|
- og.order_goods_id,
|
|
|
- (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
|
|
|
+ og.order_goods_id
|
|
|
+ <if test="querySign == null or querySign == '' or querySign == 0">
|
|
|
+ ,
|
|
|
+ (SELECT GROUP_CONCAT(subject_name) from course_subject where FIND_IN_SET(id,g.subject_ids)) subject_names
|
|
|
+ </if>
|
|
|
FROM `order` o
|
|
|
LEFT JOIN order_goods og ON o.order_sn = og.order_sn
|
|
|
LEFT JOIN order_goods_free ogf ON og.order_goods_id = ogf.order_goods_id
|