Merge branch 'bugfix_220425' into 'master'

渠道列表bug修复&我的盲票sql优化

See merge request quanshu/mp-server!442

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -63,12 +63,12 @@
            left join mp_channel t2 on t1.parent_id = t2.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as site_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level= 0
                       group by q1.channel_id) t3 on t3.channel_id = t1.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as child_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level> 0
                       group by q1.channel_id) t4 on t4.channel_id = t1.channel_id
            left join (select q1.channel_id,sum(q2.user_cnt) as user_cnt

mp-service/src/main/resources/mapper/user/UserTicketOrderItemMapper.xml

@@ -26,14 +26,14 @@
     </select>
 
     <select id="listMyTicketVO" resultType="com.qs.mp.admin.domain.vo.TicketListVO">
-        select t1.item_id, t3.*, t4.pic_url, t6.title prizeInfo, t6.`value`,t6.prize_type
-        from mp_user_ticket_order_item t1
-         left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
-         left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
-         left join mp_ticket_box t4 on t3.box_id = t4.box_id
-         left join mp_user_hit_prize t5 on t2.order_id = t5.order_id
-         left join mp_ticket_awards_prize t6 on t5.prize_id = t6.prize_id
-            ${ew.customSqlSegment}
+      select t1.item_id, t3.*, t4.pic_url, t6.title prizeInfo, t6.`value`,t6.prize_type
+      from mp_user_ticket_order_item t1
+             left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
+             left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
+             left join mp_ticket_box t4 on t3.box_id = t4.box_id
+             left join mp_user_hit_prize t5 on t5.ticket_id = t1.ticket_id
+             left join mp_ticket_awards_prize t6 on t6.prize_id = t5.prize_id
+        ${ew.customSqlSegment}
     </select>
 
     <select id="countMyTicket" resultType="Integer">