From 9c876cd2907db0375e1b1d753a16018aac1d0cb1 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Mon, 16 Oct 2023 17:09:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/CockpitScreenServiceImpl.java | 7 +++++++ .../src/main/resources/mapper/WxCouponOrderMapper.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java index 11f63b1dd..d31a4a6ff 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CockpitScreenServiceImpl.java @@ -150,6 +150,13 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { return getResult(years, mappings); } + /** + * 该接口数据未统计积分卷和停车劵 + * + * @param tenantInfo + * @param year + * @return {@link List}<{@link CountOrderTrendVO}> + */ @Override public List countOrderTrend(TenantEntity tenantInfo, Integer year) { year = year != null ? year : DateUtils.getYear(new Date()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index f66016e62..b9d9de09d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -1233,10 +1233,10 @@ WHERE `tenant_id` = #{tenantId} - and `coupon_order_status` = #{couponOrderStatus} + AND `coupon_order_status` = #{couponOrderStatus} - and DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( #{specificDate}, '%Y-%m-%d' ) + AND DATE_FORMAT( create_date, '%Y-%m-%d' ) = DATE_FORMAT( #{specificDate}, '%Y-%m-%d' )