From 7619eecf682cb76b68d169288eb5007fe06cd2f4 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Mon, 30 Sep 2024 17:57:29 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hiver-admin/test-output/test-report.html         | 16 ++++++++--------
 .../serviceimpl/mybatis/SaleServiceImpl.java     |  8 +++++---
 .../src/main/resources/mapper/ProductMapper.xml  | 12 ++++++++----
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html
index 7c187d44..ee80503b 100644
--- a/hiver-admin/test-output/test-report.html
+++ b/hiver-admin/test-output/test-report.html
@@ -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">九月 30, 2024 00:39:10</span></a>
+<a href="#"><span class="badge badge-primary">九月 30, 2024 17:44:36</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:39:10 上午</span> / <span>0.016 secs</span></p>
+            <p class="text-sm"><span>17:44:37 下午</span> / <span>0.02 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'>09.30.2024 00:39:10</span>
-<span class='badge badge-danger'>09.30.2024 00:39:10</span>
-<span class='badge badge-default'>0.016 secs</span>
+<span class='badge badge-success'>09.30.2024 17:44:37</span>
+<span class='badge badge-danger'>09.30.2024 17:44:37</span>
+<span class='badge badge-default'>0.02 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:39:10</td>
+        <td>17:44:37</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>九月 30, 2024 00:39:10</h3>
+<h3>九月 30, 2024 17:44:36</h3>
 </div></div>
 </div>
 <div class="col-md-3">
 <div class="card"><div class="card-body">
 <p class="m-b-0">Ended</p>
-<h3>九月 30, 2024 00:39:10</h3>
+<h3>九月 30, 2024 17:44:37</h3>
 </div></div>
 </div>
 <div class="col-md-3">
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
index 2abe582e..e02fc611 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/SaleServiceImpl.java
@@ -251,9 +251,11 @@ public class SaleServiceImpl extends ServiceImpl<SaleMapper, Sale> implements Sa
             for (BuyCountVo buyCountVo : buyCount) {
                 buyCountMap.put(buyCountVo.getProductId(), buyCountVo.getBuyCount());
             }
-            for (SaleDetailDTO saleDetailDTO : sale.getSaleDetailDTOList()) {
-                String productId = saleDetailDTO.getProductId();
-                saleDetailDTO.setBuyCount(buyCountMap.getOrDefault(productId, 0));
+            if(sale != null && sale.getSaleDetailDTOList() != null){
+                for (SaleDetailDTO saleDetailDTO : sale.getSaleDetailDTOList()) {
+                    String productId = saleDetailDTO.getProductId();
+                    saleDetailDTO.setBuyCount(buyCountMap.getOrDefault(productId, 0));
+                }
             }
         }
 
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
index ca6a40e3..cd40ed4a 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/ProductMapper.xml
@@ -575,7 +575,7 @@
         t.tail_warn,
         t.in_storage_status,
         t.customer_category_rule,
-        COALESCE(ss.total_stock_count, 0) AS total_stock_count,
+        COALESCE(ss.stock_count + ss.minus_stock_count, 0) AS total_stock_count,
         COALESCE(ss.stock_count, 0) AS stock_count,
         COALESCE(ss.minus_stock_count, 0) AS minus_stock_count
         <if test='queryParams.startDate !=null and queryParams.startDate.trim() neq "" and queryParams.endDate !=null and queryParams.endDate.trim() neq ""'>
@@ -584,7 +584,6 @@
         FROM t_product t
         LEFT JOIN (
         SELECT
-        sum( s.stock_count ) AS total_stock_count,
         sum( CASE WHEN s.stock_count &lt; 0 THEN 0 ELSE s.stock_count END ) AS stock_count,
         sum( CASE WHEN s.stock_count > 0 THEN 0 ELSE s.stock_count END ) AS minus_stock_count,
         shop_id,
@@ -666,8 +665,13 @@
             </if>
         </if>
         <!-- 濡傛灉sort瀛楁涓簊tockCount,鍒欐寜鐓otal_stock_count搴撳瓨鏁版帓搴� -->
-        <if test='queryParams.sort !=null and queryParams.sort.trim() eq "stockCount"'>
-            total_stock_count #{queryParams.order} ,
+        <if test='queryParams.sort !=null and queryParams.sort.trim() eq "stockCount" and queryParams.order !=null and queryParams.order.trim() neq "" '>
+            <if test='queryParams.order.trim() eq "desc" '>
+                total_stock_count desc ,
+            </if>
+            <if test='queryParams.order.trim() eq "asc" '>
+                total_stock_count asc ,
+            </if>
         </if>
 
         t.in_storage_status asc, t.del_flag desc,t.create_time desc, id