app/bill/getsupplierBill 修改sql 增加数字5

2 years ago · 4b9cad4fd4
2 changed files with 10 additions and 10 deletions
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@ -5,7 +5,7 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-<title>Hiver测试报告</title>
+<title>Hiver测试报告</title>
 <link rel="apple-touch-icon" href="spark/logo.png">
 <link rel="shortcut icon" href="spark/logo.png">
 <link rel="stylesheet" href="spark/spark-style.css">
@ -35,7 +35,7 @@
 <a href="#"><span class="badge badge-primary">Hiver</span></a>
 </li>
 <li class="m-r-10">
-<a href="#"><span class="badge badge-primary">十月 16, 2024 00:19:02</span></a>
+<a href="#"><span class="badge badge-primary">十月 17, 2024 22:13:52</span></a>
 </li>
 </ul>
 </div>
@ -84,7 +84,7 @@
          <div class="test-detail">
            <span class="meta text-white badge badge-sm"></span>
            <p class="name">passTest</p>
-            <p class="text-sm"><span>00:19:02 上午</span> / <span>0.017 secs</span></p>
+            <p class="text-sm"><span>22:13:53 下午</span> / <span>0.011 secs</span></p>
          </div>
          <div class="test-contents d-none">
 <div class="detail-head">
@ -92,9 +92,9 @@
 <div class="info">
 <div class='float-right'><span class='badge badge-default'>#test-id=1</span></div>
 <h5 class="test-status text-pass">passTest</h5>
-<span class='badge badge-success'>10.16.2024 00:19:02</span>
-<span class='badge badge-danger'>10.16.2024 00:19:02</span>
-<span class='badge badge-default'>0.017 secs</span>
+<span class='badge badge-success'>10.17.2024 22:13:53</span>
+<span class='badge badge-danger'>10.17.2024 22:13:53</span>
+<span class='badge badge-default'>0.011 secs</span>
 </div>
 <div class="m-t-10 m-l-5"></div>
 </div>
@ -104,7 +104,7 @@
  <tbody>
      <tr class="event-row">
        <td><span class="badge log pass-bg">Pass</span></td>
-        <td>0:19:02</td>
+        <td>22:13:53</td>
        <td>
          Test passed
        </td>
@ -128,13 +128,13 @@
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Started</p>
-<h3>十月 16, 2024 00:19:02</h3>
+<h3>十月 17, 2024 22:13:52</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>十月 16, 2024 00:19:02</h3>
+<h3>十月 17, 2024 22:13:53</h3>
 </div></div>
 </div>
 <div class="col-md-3">
--- 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
        <!--20240802 排除掉删除的交易记录-->
        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')