|
|
@@ -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
|