Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!654

mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -27,10 +27,12 @@
     </sql>
 
     <select id="listPrizeVO" resultType="com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO">
-        select t1.*, t2.*,
+        select
             if(t2.prize_type = 'goods' AND t3.title is not null,t3.title,t2.title) as title,
             if(t2.prize_type = 'goods' AND t3.title is not null,t3.pic_url,t2.pic_url) as pic_url,
-            if(t2.prize_type = 'goods' AND t3.value is not null,t3.value,t2.value) as value
+            if(t2.prize_type = 'goods' AND t3.value is not null,t3.value,t2.value) as value,
+            t1.*,
+            t2.*
         from mp_ticket_awards t1
         left join mp_ticket_awards_prize t2 on t1.awards_id = t2.awards_id
         left join mp_goods t3 on t2.ref_id = t3.goods_id
@@ -38,10 +40,11 @@
     </select>
 
     <select id="listByQueryWrapper" resultType="com.qs.mp.admin.domain.TicketAwardsPrize">
-        select t1.*,
-               if(t1.prize_type = 'goods' AND t2.title is not null ,t2.title,t1.title) as title,
-               if(t1.prize_type = 'goods' AND t2.pic_url is not null,t2.pic_url,t1.pic_url) as pic_url,
-               if(t1.prize_type = 'goods' AND t2.value is not null,t2.value,t1.value) as value
+        select
+            if(t1.prize_type = 'goods' AND t2.title is not null ,t2.title,t1.title) as title,
+            if(t1.prize_type = 'goods' AND t2.pic_url is not null,t2.pic_url,t1.pic_url) as pic_url,
+            if(t1.prize_type = 'goods' AND t2.value is not null,t2.value,t1.value) as value,
+            t1.*
         from mp_ticket_awards_prize t1
          left join mp_goods t2 on t1.ref_id = t2.goods_id
         ${ew.customSqlSegment}