From 0c33b0e8bbdb04cd677a1f3c5569a8d993440725 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 2 Mar 2024 17:16:26 +0800 Subject: [PATCH] fix --- .../src/main/resources/db/migration/V20240200001.sql | 1 + .../java/com/iformall/domain/po/WxCashBackActivity.java | 4 ++++ .../src/main/resources/mapper/WxCashBackActivityMapper.xml | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql index f1d2c0409..1ad9fee71 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql @@ -9,6 +9,7 @@ CREATE TABLE `wx_cash_back_activity` ( `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间', `limit_money` decimal(10,3) NOT NULL COMMENT '最低订单金额', + `all_merchant` int(1) NOT NULL DEFAULT '0' COMMENT '是否全部商户', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='卡券'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index 6cc1155c0..8f8d16b89 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -35,6 +35,8 @@ public class WxCashBackActivity extends TenantEntity { private Date endTime; @io.swagger.annotations.ApiModelProperty(value = "最低订单金额", name = "limitMoney") private BigDecimal limitMoney; + @io.swagger.annotations.ApiModelProperty(value = "是否全部商户EnumYesOrNo", name = "allMerchant") + private Integer allMerchant; @TableField(exist = false) private Integer validTime; @@ -62,4 +64,6 @@ public class WxCashBackActivity extends TenantEntity { private Long merchantId; + + } diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml index ae5dd415f..c141801fe 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml @@ -12,10 +12,11 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`status`,`name`,`create_date`,`update_date`,`start_time`,`end_time`,`limit_money` + `id`,`tenant_id`,`parent_tenant_id`,`status`,`name`,`create_date`,`update_date`,`start_time`,`end_time`,`limit_money`,`all_merchant` @@ -40,6 +41,10 @@ and `end_time` <= #{end} + + and `all_merchant` = #{allMerchant} + + and end_time >= now()