Преглед изворни кода

fix(statistics):修复今日预期收入统计逻辑

- 修改预期收入计算方式,关联订单状态过滤无效数据
- 排除订单状态为0、3、4、5、6的记录
- 确保统计数据准确性,仅计算有效订单的分账金额
- 优化SQL查询结构,明确表别名使用
-保持原有金额单位转换逻辑(除以100)
SheepHy пре 1 месец
родитељ
комит
5a3cc3bcd5

+ 4 - 5
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/StatisticsMapper.xml

@@ -143,12 +143,11 @@
                          ), 0) AS validOrderCount,
 
                      COALESCE((
-                                  SELECT SUM(pre_amount) / 100
-                                  FROM nm_profit_sharing_info
-                                  WHERE org_code = #{orgCode}
-                                    AND DATE(create_time) = CURDATE()
+                                  SELECT SUM(nm_profit_sharing_info.pre_amount) / 100
+                                  FROM nm_profit_sharing_info LEFT JOIN nm_order_pro_info ON nm_profit_sharing_info.order_id = nm_order_pro_info.order_id
+                                  WHERE nm_profit_sharing_info.org_code = #{orgCode} AND nm_order_pro_info.order_status NOT IN (0, 3, 4, 5, 6)
+                                    AND DATE(nm_profit_sharing_info.create_time) = CURDATE()
                          ), 0) AS expectedIncome,
-
                      COALESCE((
                                   SELECT COUNT(DISTINCT nm_order_pro_info.family_user_id)
                                   FROM nm_order_pro_info