diff --git a/internal/dao/bundleExtend.go b/internal/dao/bundleExtend.go index 2542dd1..ca6997b 100644 --- a/internal/dao/bundleExtend.go +++ b/internal/dao/bundleExtend.go @@ -83,7 +83,7 @@ func GetBundleBalanceList(req *bundle.GetBundleBalanceListReq) (data []model.Bun WHEN bb.expired_at > NOW() THEN 2 ELSE 1 END AS balance_status`). - Joins("LEFT JOIN `micro-account`.real_name rn ON u.real_name_id = rn.id"). + Joins("LEFT JOIN `micro-account`.real_name rn ON u.real_name_id = rn.id and rn.deleted_at = 0"). Joins("LEFT JOIN (?) as bor ON bor.customer_id = u.id", subQuery). Joins("LEFT JOIN bundle_balance bb ON u.id = bb.user_id AND bb.order_uuid = bor.uuid and bb.deleted_at is null"). Joins("LEFT JOIN bundle_activate bc on bc.user_id = u.id"). diff --git a/internal/dao/bundleMetrics.go b/internal/dao/bundleMetrics.go index a0a3a4d..fc4dcca 100644 --- a/internal/dao/bundleMetrics.go +++ b/internal/dao/bundleMetrics.go @@ -240,6 +240,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi Joins("LEFT JOIN cast_work_log AS cwl ON cwl.work_uuid = cw.uuid and cwl.work_status = 9"). Where("cwl.work_status = 9"). Where("cwe.cost_type in ?", []int{1, 2}). + Where("cw.work_category = ?", 2). Where("cw.status in ?", []int{7, 6, 9}). Where("cwl.update_time >= ?", req.Start+" 00:00:00"). Where("cwl.update_time <= ?", req.End+" 23:59:59").