M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-06-18 14:24:44 +03:00
parent e5618b45ef
commit 492fec7a28
2 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
svc/routes/wholesale_campaigns.go
View File

@@ -486,7 +486,7 @@ SELECT
COALESCE(sc.code,'') AS code,
COALESCE(sc.title,'') AS title,
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS at
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS at
FROM zbggcampaign z
LEFT JOIN sdcampaign sc
ON sc.id = z.sdcampaign_id
@@ -877,7 +877,7 @@ SELECT
COALESCE(sc.code,'') AS code,
COALESCE(sc.title,'') AS title,
COALESCE(sc.discount_rate, 0)::float8 AS discount_rate,
COALESCE(to_char(z.zlins_dttm, 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm
COALESCE(to_char(COALESCE(z.zlupd_dttm, z.zlins_dttm), 'YYYY-MM-DD HH24:MI:SS'), '') AS campaign_last_dttm
FROM latest l
LEFT JOIN zbggcampaign z
ON z.id = l.z_id