From 0d25e7bcb0bdd7a30443d08282df755fdd408edc Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Sat, 18 Oct 2025 17:06:42 +0800
Subject: [PATCH] =?UTF-8?q?10-18=20=E6=94=B6=E6=AC=BE:=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9C=B0=E5=8C=BA=E5=90=8D=E4=B8=8E=E8=B4=A7?=
 =?UTF-8?q?=E5=B8=81=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/cashMapper/CashCollectionMapper.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml
index 863ad83..45110cd 100644
--- a/src/main/resources/cashMapper/CashCollectionMapper.xml
+++ b/src/main/resources/cashMapper/CashCollectionMapper.xml
@@ -105,19 +105,27 @@
     <!--多条件查询收款订单列表-->
     <select id="selectCollection1" resultType="com.example.demo.domain.vo.cash.CashCollection">
         select cr.id,cr.jwcode,cr.name,cr.market,
-               m.name as marketName,cr.activity,cr.order_code,cr.bank_code,
-               cr.goods_name,cr.good_num,cr.permanent_gold,cr.free_gold,cr.payment_currency,cr.payment_amount/100 as paymentAmount,
-               cr.received_currency,cr.received_amount/100 as receivedAmount,cr.handling_charge/100 as handlingCharge,
-               cr.received_market,cr.pay_type,cr.pay_time,cr.received_time,
+               m1.name as marketName,
+               cr.activity,cr.order_code,cr.bank_code,
+               cr.goods_name,cr.good_num,cr.permanent_gold,cr.free_gold,cr.payment_amount/100 as paymentAmount,
+               r1.rate_name as paymentCurrency,
+               r2.rate_name as receivedCurrency,
+               m2.name as receivedMarket,
+               cr.received_amount/100 as receivedAmount,cr.handling_charge/100 as handlingCharge,
+               cr.pay_type,cr.pay_time,cr.received_time,
                cr.status,cr.submitter_id,cr.voucher,cr.remark,cr.reject_reason,
                cr.audit_id,cr.create_time,cr.update_time,cr.audit_time,
                a1.admin_name as submitterName,
                a2.admin_name as auditName
 
+
         from cash_record cr
         left join admin a1 on cr.submitter_id = a1.id
         left join admin a2 on cr.audit_id = a2.id
-        left join market m on m.id = cr.market
+        left join market m1 on m1.id = cr.market
+        left join market m2 on m2.id = cr.received_market
+        left join rate r1 on r1.id = cr.payment_currency
+        left join rate r2 on r2.id = cr.received_currency
         <where>
             1 = 1
             <if test="cashCollection.market != null and cashCollection.market != ''">