1

pro-base/src/main/resources/mybatis/transactionRecord/TransactionRecord.xml

@@ -47,7 +47,7 @@
                 AND p.payment_method = #{paymentMethod}
             </if>
         </where>
-        order by p.pay_time desc
+        order by r.group_name , r.disc_name , r.build_name , r.room_no + 0
     </select>
 
     <select id="reFundRecord" resultType="com.idea.transactionRecordManage.vo.NccRecordVo">
@@ -92,7 +92,7 @@
                 </foreach>
             </if>
         </where>
-        order by d.created_at desc
+        order by pr.group_name , pr.disc_name , pr.build_name , pr.room_no + 0
     </select>
 
     <select id="refundListByIds" resultType="com.idea.paymentManagement.dto.RefundManageDto">
@@ -131,11 +131,16 @@
         i.received_amount money,
         i.serial_number,
         i.bank_number,
-        u.truename createdName
+        u.truename createdName,
+        pr.group_name,
+        pr.disc_name,
+        pr.build_name,
+        pr.room_no
         from convert_record cr
         left join customer_management cm on cm.id = cr.customer_management_id
         left join intentional_deposit i on i.id = cr.business_id and i.status!= 1
         left join frame_user u on u.id = cr.created_by
+        left join park_room pr on pr.id = cr.house_id
         where cr.business_type = 'intentional_deposit'
         union ALL
         select
@@ -145,11 +150,16 @@
         p.pay_money money,
         p.serial_number,
         p.bank_number,
-        u.truename createdName
+        u.truename createdName,
+        pr.group_name,
+        pr.disc_name,
+        pr.build_name,
+        pr.room_no
         from convert_record cr
         left join customer_management cm on cm.id = cr.customer_management_id
         left join pay_log p on p.id = cr.business_id
         left join frame_user u on u.id = cr.created_by
+        left join park_room pr on pr.id = cr.house_id
         where cr.business_type = 'pay_log'
         ) t
         <where>
@@ -178,6 +188,7 @@
                 </foreach>
             </if>
         </where>
+        order by t.group_name , t.disc_name , t.build_name , t.room_no + 0
     </select>
 
     <select id="collectionSubmitRecord" resultType="com.idea.transactionRecordManage.model.CollectionRecord">