From b4d134674ffa10e853da5dfe05b784845a78bfbe Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 23 Sep 2025 16:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B3=E6=97=B6=E9=94=80=E5=94=AE=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=AE=8C=E5=96=84=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AE=BF?=
 =?UTF-8?q?=E5=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/visitor/app/VisitorsAppYYDetailVo.java    |  3 +++
 .../SQL_FIX_SCRIPT_GUIDE.md                      |  1 +
 .../fix_inventory_total_amount.sql               |  1 +
 .../impl/RealtimeSalesReportServiceImpl.java     | 16 ++++++++++++++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java
index b700dabf4..efe6cba32 100644
--- a/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java
+++ b/pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/visitor/app/VisitorsAppYYDetailVo.java
@@ -21,6 +21,9 @@ import java.util.List;
 public class VisitorsAppYYDetailVo {
 
 
+	@Schema(description="id")
+	private Long id;
+
 	/**
 	* 姓名
 	*/
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/SQL_FIX_SCRIPT_GUIDE.md b/pjcloud-supermarket/pjcloud-supermarket-biz/SQL_FIX_SCRIPT_GUIDE.md
index 7d9a96292..060cc4e32 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/SQL_FIX_SCRIPT_GUIDE.md
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/SQL_FIX_SCRIPT_GUIDE.md
@@ -224,3 +224,4 @@ WHERE status = 'INCONSISTENT';
 ```
 
 如果发现新的不一致数据，可以重新执行修复脚本。
+
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql b/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql
index 2d648d35f..f22ad7143 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/fix_inventory_total_amount.sql
@@ -159,3 +159,4 @@ GROUP BY r.id, r.inventory_code, r.inventory_date, r.total_amount;
        WHERE i.inventory_id = r.id
    );
 */
+
diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/RealtimeSalesReportServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/RealtimeSalesReportServiceImpl.java
index 56d9f99a2..638f664ae 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/RealtimeSalesReportServiceImpl.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/RealtimeSalesReportServiceImpl.java
@@ -474,7 +474,19 @@ public class RealtimeSalesReportServiceImpl implements RealtimeSalesReportServic
             productWrapper.eq(SmErpSpuEntity::getCategoryId, queryDTO.getCategoryId());
         }
         
-        List<SmErpSpuEntity> products = smErpSpuMapper.selectList(productWrapper);
+        List<SmErpSpuEntity> allProducts = smErpSpuMapper.selectList(productWrapper);
+        
+        // 过滤掉补差价商品（纯数字的商品名称）
+        List<SmErpSpuEntity> products = allProducts.stream()
+                .filter(product -> {
+                    String productName = product.getProductName();
+                    if (StrUtil.isBlank(productName)) {
+                        return true; // 保留商品名称为空的记录
+                    }
+                    // 过滤掉只包含数字（可能包含小数点）的商品名称，如：0.5, 1.0, 10, 100等
+                    return !productName.matches("^[0-9]+\\.?[0-9]*$");
+                })
+                .collect(Collectors.toList());
         
         if (CollectionUtils.isEmpty(products)) {
             return rankingList;
@@ -1226,7 +1238,7 @@ public class RealtimeSalesReportServiceImpl implements RealtimeSalesReportServic
                     .sum();
             
             int salesCount = productItems.size();
-            BigDecimal unitPrice = salesCount > 0 ? 
+            BigDecimal unitPrice = (salesCount > 0 && totalQuantity > 0) ? 
                     totalAmount.divide(new BigDecimal(totalQuantity), 2, RoundingMode.HALF_UP) : 
                     BigDecimal.ZERO;