Merge remote-tracking branch 'origin/master'

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("批量付款应全部付款");
             }

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 id in (" separator="," close=")">
             #{id}
         </foreach>
     </select>