From e95c602e857a6d2a5e1552be12b258ac0f90e29b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 7 Apr 2025 10:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/ConsStockFlowMapper.xml  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
index cb5b52c2..a1c812d0 100644
--- a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
@@ -36,20 +36,21 @@
         </if>
     </select>
     <select id="selectByVendorId" resultType="com.czg.product.vo.ShopVendorBillRecordVO">
-        SELECT id,
-        con_name,
-        purchase_price,
-        in_out_number,
-        amount_payable,
-        actual_payment_amount,
-        remark,
-        create_time,
-        (amount_payable - actual_payment_amount) as unPaidAmount
+        SELECT tb_cons_stock_flow.id,
+        tb_cons_stock_flow.con_name,
+        tb_cons_stock_flow.purchase_price,
+        tb_cons_stock_flow.in_out_number,
+        tb_cons_stock_flow.amount_payable,
+        tb_cons_stock_flow.actual_payment_amount,
+        tb_cons_stock_flow.remark,
+        tb_cons_stock_flow.create_time,
+        (tb_cons_stock_flow.amount_payable - tb_cons_stock_flow.actual_payment_amount) as unPaidAmount
         FROM tb_cons_stock_flow
-        WHERE shop_id = #{shopId}
-        and vendor_id = #{vendorId}
+        left join tb_shop_vendor on tb_cons_stock_flow.vendor_id = tb_shop_vendor.id
+        WHERE tb_cons_stock_flow.shop_id = #{shopId}
+        and tb_cons_stock_flow.vendor_id = #{vendorId}
         <if test="key != null and key != ''">
-            and `name` like concat('%', #{key}, '%')
+            and tb_shop_vendor.`name` like concat('%', #{key}, '%')
         </if>
     </select>