From 1366394fb42eeaaa170d4c0b853a1013716fe76a Mon Sep 17 00:00:00 2001
From: lin <642018748@qq.com>
Date: Wed, 12 Apr 2023 20:39:31 +0800
Subject: [PATCH] fix trade daily
---
.../mapper/WxMerchantTradeDailyMapper.xml | 22 ++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
index f461a4a17..767c1d070 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml
@@ -72,9 +72,25 @@
and id != #{ignoreId}
+
+ and date_type = 1
+
+ and report_date >= date_format(#{startTime},'%Y-%m-%d')
+ and report_date <= date_format(#{endTime},'%Y-%m-%d')
+
+
+
+
+ and date_type = 2
+
+ and report_date >= date_format(#{startTime},'%Y-%m')
+ and report_date <= date_format(#{endTime},'%Y-%m')
+
+
+
- and mtd.report_date >= date_format(#{startTime},'%Y-%m-%d')
- and mtd.report_date <= date_format(#{endTime},'%Y-%m-%d')
+ and report_date >= date_format(#{startTime},'%Y-%m-%d')
+ and report_date <= date_format(#{endTime},'%Y-%m-%d')
@@ -99,7 +115,7 @@