From 4b9cad4fd4e5b7cef0f95b5e26da578a4302e675 Mon Sep 17 00:00:00 2001 From: qiaohui <924337501@qq.com> Date: Fri, 18 Oct 2024 10:13:28 +0800 Subject: [PATCH] =?UTF-8?q?app/bill/getsupplierBill=20=E4=BF=AE=E6=94=B9sq?= =?UTF-8?q?l=20=20=E5=A2=9E=E5=8A=A0=E6=95=B0=E5=AD=975?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hiver-admin/test-output/test-report.html | 18 +++++++++--------- .../resources/mapper/DealingsRecordMapper.xml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index b62f199f..9dc1f97c 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -5,7 +5,7 @@ -Hiver测试报告 +Hiver娴嬭瘯鎶ュ憡 @@ -35,7 +35,7 @@ Hiver
  • -十月 16, 2024 00:19:02 +鍗佹湀 17, 2024 22:13:52
    • @@ -84,7 +84,7 @@

    passTest

    -

    00:19:02 上午 / 0.017 secs

    +

    22:13:53 涓嬪崍 / 0.011 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -10.16.2024 00:19:02 -10.16.2024 00:19:02 -0.017 secs +10.17.2024 22:13:53 +10.17.2024 22:13:53 +0.011 secs
    @@ -104,7 +104,7 @@ Pass - 0:19:02 + 22:13:53 Test passed @@ -128,13 +128,13 @@

    Started

    -

    十月 16, 2024 00:19:02

    +

    鍗佹湀 17, 2024 22:13:52

    Ended

    -

    十月 16, 2024 00:19:02

    +

    鍗佹湀 17, 2024 22:13:53

    diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml index 2c4645b7..420b90c6 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/DealingsRecordMapper.xml @@ -196,7 +196,7 @@ WHERE tdr.del_flag != 2 - and tdr.dealings_type in ( '2','3','4','6','7' ) + and tdr.dealings_type in ( '2','3','4','5','6','7' ) and tdr.dealings_user_id = #{supplierBillQueryVo.supplierId} and tdr.shop_id = #{supplierBillQueryVo.shopId} and (tdr.sale_id is null or ts.in_storage_status = '1')