fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feat-hjj-Competitors#A203' into dev

Browse Source
This commit is contained in:
jiaji.H 2026-01-05 13:47:38 +08:00
commit a795b5b491
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/dao/bundleMetrics.go
View File

@ -20,7 +20,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
// ---------- 总金额统计 ----------
subQuery := app.ModuleClients.BundleDB.Model(&model.Reconciliation{}).
Select("TRUNCATE(COALESCE(SUM(CAST(handling_fee AS DECIMAL(12,3))), 0), 3) as total_fee_payment_amount").
Joins("LEFT JOIN bundle_order_records bor ON bor.order_no = bundle_order_on").
Joins("LEFT JOIN bundle_order_records bor ON bor.order_no COLLATE utf8mb4_general_ci = reconciliation.bundle_order_on COLLATE utf8mb4_general_ci").
Where("bor.deleted_at is null and bor.status=2")
// if req.BundleUuid != "" {
// subQuery = subQuery.Where("bor.bundle_uuid = ?", req.BundleUuid)
@ -72,7 +72,7 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
subQuery = app.ModuleClients.BundleDB.Model(&model.Reconciliation{}).
Select("SUM(handling_fee) as new_fee_payment_amount, SUM(pay_amount) as new_payment_amount").
Joins("LEFT JOIN bundle_order_records bor ON bor.order_no = bundle_order_on").
Joins("LEFT JOIN bundle_order_records bor ON bor.order_no COLLATE utf8mb4_general_ci = bundle_order_on COLLATE utf8mb4_general_ci").
Where("`reconciliation`.pay_time >= ?", req.Start+" 00:00:00").
Where("`reconciliation`.pay_time <= ?", req.End+" 23:59:59").
Where("`reconciliation`.deleted_at is null and reconciliation.pay_status = 2 and bor.status=2 and bor.deleted_at is null")