新增资金出款查询与财务统计

2026-07-26 16:18:31 +08:00
parent 321f0781cf
commit dbe0cda2c6
17 changed files with 1604 additions and 31 deletions
@@ -48,10 +48,19 @@ func (r *Repository) applyDetailFilters(db *gorm.DB, query DetailQuery) *gorm.DB
 	if query.SettlementStatus != "" {
 		db = db.Where("ro.settlement_status = ?", query.SettlementStatus)
 	}
+	if query.SettlementMode != "" {
+		db = db.Where("ro.settlement_mode = ?", query.SettlementMode)
+	}
+	if query.OfflineSettlementStatus != "" {
+		db = db.Where("COALESCE(NULLIF(ro.offline_settlement_status, ''), 'none') = ?", query.OfflineSettlementStatus)
+	}
 	if !query.StartDate.IsZero() && !query.EndDate.IsZero() {
-		if query.DateType == "created" {
+		switch query.DateType {
+		case "created":
 			db = db.Where("ro.created_at >= ? AND ro.created_at <= ?", query.StartDate, query.EndDate)
-		} else {
+		case "offline_settled":
+			db = db.Where("ro.offline_settled_at >= ? AND ro.offline_settled_at <= ?", query.StartDate, query.EndDate)
+		default:
 			db = db.Where("ro.settled_at >= ? AND ro.settled_at <= ?", query.StartDate, query.EndDate)
 		}
 	}