Merge remote-tracking branch 'origin/master'

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>