From 0ca9a2bddf9362b2a63e78ac68c23e90fe99c0a1 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 11:48:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ConsStockFlowMapper.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a1c812d03..7bdb1544e 100644
--- a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
@@ -56,7 +56,7 @@
 
     <select id="selectUnPaid" resultType="com.czg.product.entity.ConsStockFlow">
         select * from tb_cons_stock_flow where amount_payable > actual_payment_amount and shop_id=#{shopId}
-        <foreach collection="vendorIds" item="id" open="and vendor_id in (" separator=",">
+        <foreach collection="vendorIds" item="id" open="and vendor_id in (" separator="," close=")">
             #{id}
         </foreach>
     </select>

From 2392bf4be82fed95cc186a1b0d7e64fbe3fe58a2 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 13:43:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/product/service/impl/ShopVendorServiceImpl.java   | 4 ++++
 .../src/main/resources/mapper/ConsStockFlowMapper.xml         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java
index 62fe82c3d..1005e1647 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopVendorServiceImpl.java
@@ -149,6 +149,10 @@ public class ShopVendorServiceImpl extends ServiceImpl<ShopVendorMapper, ShopVen
                         .setFlowId(item.getId()).setUserId(StpKit.USER.getLoginIdAsLong()).setCreateTime(DateUtil.date().toLocalDateTime()));
             }
 
+            if (unPaidAmount.compareTo(BigDecimal.ZERO) == 0) {
+                throw new ApiNotPrintException("此账单已付款");
+            }
+
             if (unPaidAmount.compareTo(payDTO.getAmount()) != 0) {
                 throw new ApiNotPrintException("批量付款应全部付款");
             }
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 7bdb1544e..86dd3ea60 100644
--- a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
@@ -56,7 +56,7 @@
 
     <select id="selectUnPaid" resultType="com.czg.product.entity.ConsStockFlow">
         select * from tb_cons_stock_flow where amount_payable > actual_payment_amount and shop_id=#{shopId}
-        <foreach collection="vendorIds" item="id" open="and vendor_id in (" separator="," close=")">
+        <foreach collection="vendorIds" item="id" open="and id in (" separator="," close=")">
             #{id}
         </foreach>
     </select>