Merge remote-tracking branch 'origin/hjc_goblin_list_unbox' into hjc_goblin_list_unbox

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml

@@ -3,16 +3,12 @@
 <mapper namespace="com.liquidnet.service.goblin.mapper.GoblinNftOrderMapper">
 
     <select id="searchList" resultType="com.liquidnet.service.goblin.dto.admin.GoblinNftOrderListDto">
-        select
-        a.user_id,a.order_code,a.order_type,a.pay_type,a.price_actual,a.status,a.pay_time,a.created_at,
-        b.name,
-        c.trading_at, c.nft_id
-        from goblin_nft_order as a
-        left join goblin_goods_sku as b on b.sku_id = a.sku_id
-        left join goblin_user_digital_artwork as c on c.order_id = a.order_id and c.del_flg = '0'
+        select c.trading_at, c.nft_id, a.* from (select
+        user_id,order_code,order_id,order_type,pay_type,price_actual,status,pay_time,created_at,sku_title as name
+        from goblin_nft_order
         <where>
             <if test="name!=''">
-                and b.name like concat('%', #{name}, '%')
+                and a.sku_title like concat('%', #{name}, '%')
             </if>
             <if test="userId!=''">
                 and a.user_id = #{userId}
@@ -23,9 +19,6 @@
             <if test="orderCode!=''">
                 and a.order_code = #{orderCode}
             </if>
-            <if test="nftId!=''">
-                and c.nft_id = #{nftId}
-            </if>
             <if test="orderType != null and orderType!=''">
                 and a.order_type = #{orderType}
             </if>
@@ -44,7 +37,13 @@
                 and a.pay_time <![CDATA[<=]]> #{payTimeEnd}
             </if>
         </where>
-        group by a.order_id
-        order by a.created_at desc
+        order by mid desc
+        ) as a
+        left join goblin_user_digital_artwork as c on c.order_id = a.order_id and c.del_flg = '0'
+        <where>
+            <if test="nftId!=''">
+                and c.nft_id = #{nftId}
+            </if>
+        </where>
     </select>
 </mapper>