From 49a72b25a260e8311ebb1eb10f4f285335345cba Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 28 May 2025 09:44:30 +0800
Subject: [PATCH] dev

---
 .../server/mapper/charge/ChargeOrderMapper.java    |  2 +-
 .../service/statistics/StatisticsService.java      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java
index eb5b443..812a74c 100644
--- a/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java
+++ b/src/main/java/com/syjiaer/clinic/server/mapper/charge/ChargeOrderMapper.java
@@ -19,7 +19,7 @@ import java.util.Map;
 public interface ChargeOrderMapper extends BaseMapper<ChargeOrder> {
     @Select("select * from charge_order where code = #{code}")
     ChargeOrder selectByCode(String code);
-    @Select("SELECT sale_person_id,pay_type,sum(total_price) ,count(1)  FROM charge_order GROUP BY sale_person_id,pay_type")
+    @Select("SELECT sale_person_id,pay_type,sum(total_price) as total ,count(1) as count FROM charge_order where status = 1 GROUP BY sale_person_id,pay_type")
     List<Map<String, Object>> selectSaleReport();
 }
 
diff --git a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
index bd36934..f6f3515 100644
--- a/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
+++ b/src/main/java/com/syjiaer/clinic/server/service/statistics/StatisticsService.java
@@ -156,10 +156,10 @@ public class StatisticsService extends BaseService {
                 vo.setSalePersonName(organizationMember.getName());
             }
 
-            if (map.get("sum") == null){
+            if (map.get("total") == null){
                 continue;
             }
-            vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("sum")));
+            vo.setTotalIncome(vo.getTotalIncome().add((BigDecimal) map.get("total")));
             vo.setCount(vo.getCount()+(Long) map.get("count"));
             RetailOrderPayTypeEnum payType = RetailOrderPayTypeEnum.getByCode((Integer) map.get("pay_type"));
             if (payType == null){
@@ -167,19 +167,19 @@ public class StatisticsService extends BaseService {
             }
             switch (payType) {
                 case WXPAY:
-                    vo.setWechatIncome(vo.getWechatIncome().add((BigDecimal) map.get("sum")));
+                    vo.setWechatIncome(vo.getWechatIncome().add((BigDecimal) map.get("total")));
                     break;
                 case ALIPAY:
-                    vo.setAliPayIncome(vo.getAliPayIncome().add((BigDecimal) map.get("sum")));
+                    vo.setAliPayIncome(vo.getAliPayIncome().add((BigDecimal) map.get("total")));
                     break;
                 case CASH:
-                    vo.setCashIncome(vo.getCashIncome().add((BigDecimal) map.get("sum")));
+                    vo.setCashIncome(vo.getCashIncome().add((BigDecimal) map.get("total")));
                     break;
                 case OTHER:
-                    vo.setOtherIncome(vo.getOtherIncome().add((BigDecimal) map.get("sum")));
+                    vo.setOtherIncome(vo.getOtherIncome().add((BigDecimal) map.get("total")));
                     break;
                 case MEDICARE:
-                    vo.setSocialIncome(vo.getSocialIncome().add((BigDecimal) map.get("sum")));
+                    vo.setSocialIncome(vo.getSocialIncome().add((BigDecimal) map.get("total")));
                     break;
                 default:
                     break;