Merge branch 'hotfix' into develop

src/main/resources/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.xml

@@ -11,6 +11,12 @@
         left join
         pmt_transactions t
         on o.order_id = t.order_id
+        left join
+        pmt_custom_reports r
+        on r.order_id = o.order_id
+        where
+        o.channel  = 'Alipay'
+        and o.client_id = #{client_id}
         and transaction_type = 'Credit'
         and
         o.status in (
@@ -18,12 +24,7 @@
             #{item}
         </foreach>
         )
-        left join
-        pmt_custom_reports r
-        on r.order_id = o.order_id
-        and o.client_id = #{client_id}
-        and  o.channel  = 'Alipay'
-        <where>
+
             <!--<if test="channel!=null">-->
                 <!--and o.channel = #{channel}-->
             <!--</if>-->
@@ -33,7 +34,6 @@
           <if test="report_status!=null">
               and r.report_status = #{report_status}
           </if>
-        </where>
         order by transaction_time desc
     </select>