internal/dao/bundleMetrics.go

@@ -19,9 +19,9 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Select("SUM(handling_fee)").
 		Joins("LEFT JOIN bundle_order_records bor ON bor.order_no = bundle_order_on").
 		Where("bor.deleted_at is null and bor.pay_time != ''")
-	// if req.BundleUuid != "" {
+	if req.BundleUuid != "" {
-	// 	subQuery = subQuery.Where("bor.bundle_uuid = ?", req.BundleUuid)
+		subQuery = subQuery.Where("bor.bundle_uuid = ?", req.BundleUuid)
-	// }
+	}
 	query := app.ModuleClients.BundleDB.Model(&model.BundleOrderRecords{}).
 		Select(`
 			SUM(amount) as total_bundle_payment_amount,
@@ -30,9 +30,9 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 			(?) as total_fee_payment_amount
 		`, subQuery).
 		Where("deleted_at IS NULL and pay_time != ''")
-	// if req.BundleUuid != "" {
+	if req.BundleUuid != "" {
-	// 	query = query.Where("bundle_uuid = ?", req.BundleUuid)
+		query = query.Where("bundle_uuid = ?", req.BundleUuid)
-	// }
+	}
 	err = query.First(result).Error
 	if err != nil {
 		return
@@ -46,9 +46,9 @@ func MetricsBusiness(req *bundle.MetricsBusinessReq) (result *bundle.MetricsBusi
 		Where("`reconciliation`.created_at >= ?", req.Start+" 00:00:00").
 		Where("`reconciliation`.created_at <= ?", req.End+" 23:59:59").
 		Where("`reconciliation`.deleted_at is null and bor.pay_time != ''")
-	// if req.BundleUuid != "" {
+	if req.BundleUuid != "" {
-	// 	subQuery = subQuery.Where("bor.bundle_uuid = ?", req.BundleUuid)
+		subQuery = subQuery.Where("bor.bundle_uuid = ?", req.BundleUuid)
-	// }
+	}
 
 	query = app.ModuleClients.BundleDB.Model(&model.BundleOrderRecords{}).
 		Select(`