From 6740da02fd135f3e844ea8eeb7b80722ece8f007 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 11:15:10 +0800
Subject: [PATCH] 管理后台代码生成
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 10 +
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java | 13 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java | 7
ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml | 8 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java | 51 ++++++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java | 4
ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java | 6
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java | 6
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java | 7
ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml | 2
ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml | 2
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java | 19 ++
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java | 47 ++++++
ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml | 22 +++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java | 3
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 74 +++++++++-
/dev/null | 22 ---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 5
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java | 3
ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml | 2
55 files changed, 314 insertions(+), 87 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java
index 3e928bc..ffedfad 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("gen_table")
@ApiModel(value="GenTable对象", description="")
-public class GenTable implements Serializable {
+public class GenTable {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java
index e3e09de..95f667a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("gen_table_column")
@ApiModel(value="GenTableColumn对象", description="")
-public class GenTableColumn implements Serializable {
+public class GenTableColumn {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java
index 9455601..b5d61f3 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_dict_data")
@ApiModel(value="SysDictData对象", description="")
-public class SysDictData implements Serializable {
+public class SysDictData {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java
index e88bb86..7bf5dfd 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_dict_type")
@ApiModel(value="SysDictType对象", description="")
-public class SysDictType implements Serializable {
+public class SysDictType {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
index a4bcb3b..299943e 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_notice")
@ApiModel(value="SysNotice对象", description="")
-public class SysNotice implements Serializable {
+public class SysNotice {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
index eee0dd9..11a2bf1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_activity")
@ApiModel(value="TActivity对象", description="")
-public class TActivity implements Serializable {
+public class TActivity extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java
index 5f2e57a..ab518dc 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_advertising")
@ApiModel(value="TAdvertising对象", description="")
-public class TAdvertising implements Serializable {
+public class TAdvertising extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -70,5 +71,7 @@
@TableLogic
private Integer delFlag;
-
+ @ApiModelProperty(value = "广告状态 1未开始 2已开始 3已结束")
+ @TableField(exist = false)
+ private Integer startState;
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
index 762d3b4..1c7deb6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_company")
@ApiModel(value="TCompany对象", description="")
-public class TCompany implements Serializable {
+public class TCompany extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
index 7ec1076..394efd2 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_coupon")
@ApiModel(value="TCoupon对象", description="")
-public class TCoupon implements Serializable {
+public class TCoupon extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
index dec9bd7..11d731a 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_enterprise_user_application")
@ApiModel(value="TEnterpriseUserApplication对象", description="")
-public class TEnterpriseUserApplication implements Serializable {
+public class TEnterpriseUserApplication extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java
index 106aed7..0977294 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_evaluation_tag")
@ApiModel(value="TEvaluationTag对象", description="")
-public class TEvaluationTag implements Serializable {
+public class TEvaluationTag extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
index f4666eb..35518f1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods")
@ApiModel(value="TGoods对象", description="")
-public class TGoods implements Serializable {
+public class TGoods extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java
index 4afe6d9..f4d0e56 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_html")
@ApiModel(value="THtml对象", description="")
-public class THtml implements Serializable {
+public class THtml extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
index fdef5e7..9e0a6bb 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_integral_rule")
@ApiModel(value="TIntegralRule对象", description="")
-public class TIntegralRule implements Serializable {
+public class TIntegralRule extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java
index 481d2e8..0c109c9 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice_type")
@ApiModel(value="TInvoiceType对象", description="")
-public class TInvoiceType implements Serializable {
+public class TInvoiceType extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
index d658a1a..37690d0 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_notice")
@ApiModel(value="TNotice对象", description="")
-public class TNotice implements Serializable {
+public class TNotice extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java
index c4107e2..ce0ae04 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_role_site")
@ApiModel(value="TRoleSite对象", description="")
-public class TRoleSite implements Serializable {
+public class TRoleSite extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
index 137ff52..154cd93 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_system_configuration")
@ApiModel(value="TSystemConfiguration对象", description="")
-public class TSystemConfiguration implements Serializable {
+public class TSystemConfiguration extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java
index ec3900a..e9f8372 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_site")
@ApiModel(value="TUserSite对象", description="")
-public class TUserSite implements Serializable {
+public class TUserSite extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
index 99b4ad4..f07905f 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_tag")
@ApiModel(value="TUserTag对象", description="")
-public class TUserTag implements Serializable {
+public class TUserTag extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
index cb1a418..3c75e76 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_vip")
@ApiModel(value="TVip对象", description="")
-public class TVip implements Serializable {
+public class TVip extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -33,7 +34,7 @@
@TableField("name")
private String name;
- @ApiModelProperty(value = "是否显示（0=否，1=是）")
+ @ApiModelProperty(value = "前端是否显示（0=否，1=是）")
@TableField("reveal")
private Integer reveal;
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java
new file mode 100644
index 0000000..894ae32
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java
@@ -0,0 +1,19 @@
+package com.ruoyi.other.api.dto;
+
+import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.common.core.web.page.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("广告列表查询DTO")
+public class AdvertisingDTO extends BasePage {
+
+ @ApiModelProperty(value = "状态1未开始 2进行中 3已结束")
+ private Integer startState;
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java
index 2a8cf7e..754e53e 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
@Data
-@ApiModel("积分规则DTO")
+@ApiModel("保存修改-查看详情积分规则DTO")
public class SaveIntegralDTO {
@ApiModelProperty(value = "id")
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
index fd7c16f..05ababf 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -22,7 +23,7 @@
@ApiModelProperty(value = "记录创建时间，前端忽略")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(value = "create_time", fill = FieldFill.INSERT)
- private Date createTime;
+ private LocalDateTime createTime;
/** 是否删除 0未删除 1已删除 */
@TableField("del_flag")
@@ -30,11 +31,11 @@
@TableLogic
private Boolean delFlag;
- public Date getCreateTime() {
+ public LocalDateTime getCreateTime() {
return createTime;
}
- public void setCreateTime(Date createTime) {
+ public void setCreateTime(LocalDateTime createTime) {
this.createTime = createTime;
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
index 44e2303..4e75bca 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java
@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
+import com.ruoyi.other.service.TAdvertisingService;
+import com.ruoyi.other.service.TVipService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -14,8 +23,38 @@
* @since 2024-08-06
*/
@RestController
-@RequestMapping("/t-advertising")
+@RequestMapping("/advertising")
public class TAdvertisingController {
+ @Autowired
+ private TAdvertisingService advertisingService;
+ @PostMapping("/saveAdvertising")
+ @ApiOperation(value = "广告添加")
+ public AjaxResult saveAdvertising(@RequestBody TAdvertising dto) {
+ advertisingService.save(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/delete")
+ @ApiOperation(value = "广告删除")
+ public AjaxResult delete(Integer id) {
+ advertisingService.removeById(id);
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateVip")
+ @ApiOperation(value = "广告修改")
+ public AjaxResult updateVip(@RequestBody TAdvertising dto) {
+ advertisingService.updateById(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/getInfo")
+ @ApiOperation(value = "广告查看详情")
+ public AjaxResult<TAdvertising> getInfo(Integer id) {
+ return AjaxResult.ok(advertisingService.getById(id));
+ }
+ @ApiOperation(value = "广告列表分页查询")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TAdvertising>> pageList(AdvertisingDTO dto) {
+ return AjaxResult.ok(advertisingService.pageList(dto));
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
index 5fe7e70..712ef14 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
@@ -1,10 +1,20 @@
package com.ruoyi.other.controller;
+import java.time.LocalDateTime;
+import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.THtml;
+import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.dto.SaveIntegralDTO;
+import com.ruoyi.other.service.THtmlService;
+import com.ruoyi.other.service.TIntegralRuleService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
@@ -18,24 +28,70 @@
@RestController
@RequestMapping("/integral")
public class TIntegralRuleController {
+ @Autowired
+ private THtmlService htmlService;
+ @Autowired
+ private TIntegralRuleService integralRuleService;
@GetMapping("/getSet")
@ApiOperation(value = "获取积分设置")
- public R<SaveIntegralDTO> getSet() {
- return R.ok();
+ public R<TIntegralRule> getSet() {
+ TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
+ return R.ok(res);
}
@PostMapping("/saveSet")
@ApiOperation(value = "保存积分设置")
- public R saveSet(@RequestBody SaveIntegralDTO dto) {
+ public R saveSet(@RequestBody TIntegralRule dto) {
+ integralRuleService.updateById(dto);
return R.ok();
}
- @PostMapping("/getInfo")
- @ApiOperation(value = "获取积分说明")
- public R getInfo() {
- return R.ok();
+ @GetMapping("/getInfo")
+ @ApiOperation(value = "type 1=积分规则说明，" +
+ "2=会员折扣说明，" +
+ "3=优惠券说明，" +
+ "4=双倍积分说明，" +
+ "5=商城专享价说明，" +
+ "6=会员协议，" +
+ "7=用户协议，" +
+ "8=隐私协议，" +
+ "9=邀请好友说明，" +
+ "10=资质证明，" +
+ "11=开票说明")
+ public R<String> getInfo(Integer type) {
+ THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ return R.ok(g.getContent());
}
- @PostMapping("/saveInfo")
+ @GetMapping("/saveInfo")
@ApiOperation(value = "保存积分说明")
- public R saveInfo() {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "info", value = "内容", required = true),
+ @ApiImplicitParam(name = "type", value = "type 1=积分规则说明，\" +\n" +
+ " \"2=会员折扣说明，\" +\n" +
+ " \"3=优惠券说明，\" +\n" +
+ " \"4=双倍积分说明，\" +\n" +
+ " \"5=商城专享价说明，\" +\n" +
+ " \"6=会员协议，\" +\n" +
+ " \"7=用户协议，\" +\n" +
+ " \"8=隐私协议，\" +\n" +
+ " \"9=邀请好友说明，\" +\n" +
+ " \"10=资质证明，\" +\n" +
+ " \"11=开票说明\"", required = true),
+
+ })
+ public R saveInfo(String info,Integer type) {
+ THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ if (g == null){
+ THtml tHtml = new THtml();
+ tHtml.setType(type);
+ tHtml.setContent(info);
+
+
+ tHtml.setCreateTime(LocalDateTime.now());
+ tHtml.setDelFlag(false);
+ htmlService.save(tHtml);
+ }else{
+ g.setContent(info);
+ htmlService.updateById(g);
+ }
return R.ok();
}
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
index 9171f21..0a1e9a1 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java
@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.other.api.domain.TIntegralRule;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.service.TVipService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -14,8 +23,42 @@
* @since 2024-08-06
*/
@RestController
-@RequestMapping("/t-vip")
+@RequestMapping("/vip")
public class TVipController {
+ @Autowired
+ private TVipService vipService;
+ @PostMapping("/saveVip")
+ @ApiOperation(value = "会员添加")
+ public AjaxResult saveVip(@RequestBody TVip dto) {
+ vipService.save(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/delete")
+ @ApiOperation(value = "会员删除")
+ public AjaxResult delete(Integer id) {
+ vipService.removeById(id);
+ return AjaxResult.success();
+ }
+ @PostMapping("/updateVip")
+ @ApiOperation(value = "会员修改")
+ public AjaxResult updateVip(@RequestBody TVip dto) {
+ vipService.updateById(dto);
+ return AjaxResult.success();
+ }
+ @GetMapping("/getInfo")
+ @ApiOperation(value = "会员查看详情")
+ public AjaxResult<TVip> getInfo(Integer id) {
+ return AjaxResult.ok(vipService.getById(id));
+ }
+ @ApiOperation(value = "会员列表分页查询")
+ @PostMapping(value = "/pageList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
+ @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
+ })
+ public AjaxResult<PageInfo<TVip>> pageList(Integer pageCurr,Integer pageSize) {
+ return AjaxResult.ok(vipService.pageList(pageCurr,pageSize));
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java
index 3153da8..ad59563 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.other.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +18,5 @@
*/
public interface TAdvertisingMapper extends BaseMapper<TAdvertising> {
+ List<TAdvertising> pageList(@Param("pageInfo")PageInfo<TAdvertising> pageInfo,@Param("req") AdvertisingDTO dto);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java
index afe3260..6c80804 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java
@@ -1,7 +1,11 @@
package com.ruoyi.other.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +17,6 @@
*/
public interface TVipMapper extends BaseMapper<TVip> {
+ List<TVip> pageList( @Param("pageInfo")PageInfo<TVip> pageInfo);
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java
index 79e985e..ebdb125 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java
@@ -1,7 +1,9 @@
package com.ruoyi.other.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
/**
* <p>
@@ -13,4 +15,5 @@
*/
public interface TAdvertisingService extends IService<TAdvertising> {
+ PageInfo<TAdvertising> pageList(AdvertisingDTO dto);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
index 8f83c50..27af66e 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
/**
@@ -13,4 +14,7 @@
*/
public interface TVipService extends IService<TVip> {
+ PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize);
+
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
index dcccafd..219aaed 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.other.service.impl;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
+import com.ruoyi.other.api.domain.TVip;
+import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.mapper.TAdvertisingMapper;
import com.ruoyi.other.service.TAdvertisingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +22,12 @@
@Service
public class TAdvertisingServiceImpl extends ServiceImpl<TAdvertisingMapper, TAdvertising> implements TAdvertisingService {
+ @Override
+ public PageInfo<TAdvertising> pageList(AdvertisingDTO dto) {
+
+ PageInfo<TAdvertising> pageInfo = new PageInfo<>(dto.getStartState(),dto.getPageSize());
+ List<TAdvertising> list = this.baseMapper.pageList(pageInfo,dto);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
index eaf0d38..0b9319a 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java
@@ -1,10 +1,13 @@
package com.ruoyi.other.service.impl;
+import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.mapper.TVipMapper;
import com.ruoyi.other.service.TVipService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +20,11 @@
@Service
public class TVipServiceImpl extends ServiceImpl<TVipMapper, TVip> implements TVipService {
+ @Override
+ public PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize) {
+ PageInfo<TVip> pageInfo = new PageInfo<>(pageCurr,pageSize);
+ List<TVip> list = this.baseMapper.pageList(pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml
index 814eef9..2f199b0 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableColumnMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.GenTableColumnMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.GenTableColumn">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.GenTableColumn">
<id column="column_id" property="columnId" />
<result column="table_id" property="tableId" />
<result column="column_name" property="columnName" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml
index 2a76a4a..5728dbc 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/GenTableMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.GenTableMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.GenTable">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.GenTable">
<id column="table_id" property="tableId" />
<result column="table_name" property="tableName" />
<result column="table_comment" property="tableComment" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml
index 303b91f..36dbdf8 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictDataMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysDictDataMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysDictData">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysDictData">
<id column="dict_code" property="dictCode" />
<result column="dict_sort" property="dictSort" />
<result column="dict_label" property="dictLabel" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml
index 9cbd1ac..59ce8e6 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysDictTypeMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysDictTypeMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysDictType">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysDictType">
<id column="dict_id" property="dictId" />
<result column="dict_name" property="dictName" />
<result column="dict_type" property="dictType" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml
index b1e0a9c..45e35b9 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/SysNoticeMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysNoticeMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysNotice">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysNotice">
<id column="notice_id" property="noticeId" />
<result column="notice_title" property="noticeTitle" />
<result column="notice_type" property="noticeType" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml
index 8f5847f..1c7f204 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TActivityMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TActivityMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TActivity">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TActivity">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="img" property="img" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml
index e76302f..5037242 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TAdvertisingMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TAdvertisingMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TAdvertising">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TAdvertising">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="img" property="img" />
@@ -21,5 +21,25 @@
<sql id="Base_Column_List">
id, name, img, start_time, end_time, position, jump_type, jump_url, status, create_time, del_flag
</sql>
+ <select id="pageList" resultType="com.ruoyi.other.api.domain.TAdvertising">
+ select * from t_advertising
+ <where>
+
+ <if test="req.name != null and req.name != ''">
+ AND `name` LIKE concat('%',#{req.name}, '%')
+ </if>
+ <if test="req.state == 1">
+ AND start_time >= NOW()
+ </if>
+ <if test="req.state == 2">
+ AND start_time <= NOW() AND end_time >= NOW()
+ </if>
+ <if test="req.state == 3">
+ AND end_time <= NOW()
+ </if>
+ AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ </where>
+ ORDER BY create_time DESC
+ </select>
</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml
index ac3c04e..50a9b7f 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCompanyMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TCompanyMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TCompany">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TCompany">
<id column="id" property="id" />
<result column="code" property="code" />
<result column="name" property="name" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml
index b4d5272..762311f 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TCouponMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TCouponMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TCoupon">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TCoupon">
<id column="id" property="id" />
<result column="type" property="type" />
<result column="name" property="name" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml
index 762b7a6..248ed3e 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEnterpriseUserApplicationMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TEnterpriseUserApplicationMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TEnterpriseUserApplication">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TEnterpriseUserApplication">
<id column="id" property="id" />
<result column="app_user_id" property="appUserId" />
<result column="company_name" property="companyName" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml
index 92be7c2..c39aee9 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TEvaluationTagMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TEvaluationTagMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TEvaluationTag">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TEvaluationTag">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="type" property="type" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml
index e9b35a2..4c1ebd8 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TGoodsMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TGoodsMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TGoods">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TGoods">
<id column="id" property="id" />
<result column="type" property="type" />
<result column="name" property="name" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml
index 48f4332..03eaa19 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/THtmlMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.THtmlMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.THtml">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.THtml">
<id column="id" property="id" />
<result column="type" property="type" />
<result column="content" property="content" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml
index 4c78a4c..81dda7d 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TIntegralRuleMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TIntegralRuleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TIntegralRule">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TIntegralRule">
<id column="id" property="id" />
<result column="charge_credit" property="chargeCredit" />
<result column="credit" property="credit" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml
index 718905d..2688cdd 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TInvoiceTypeMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TInvoiceTypeMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TInvoiceType">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TInvoiceType">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="invoicing_company" property="invoicingCompany" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml
index 525fe44..6325a7b 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TNoticeMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TNoticeMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TNotice">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TNotice">
<id column="id" property="id" />
<result column="content" property="content" />
<result column="start_time" property="startTime" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml
index 1678d9b..a1374fa 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TRoleSiteMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TRoleSiteMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TRoleSite">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TRoleSite">
<id column="id" property="id" />
<result column="role_id" property="roleId" />
<result column="site_id" property="siteId" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml
index 1ac01fe..6c34876 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TSystemConfigurationMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TSystemConfigurationMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TSystemConfiguration">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TSystemConfiguration">
<id column="id" property="id" />
<result column="type" property="type" />
<result column="content" property="content" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml
index 7bdfe2a..766dfbd 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserSiteMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TUserSiteMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TUserSite">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TUserSite">
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="site_id" property="siteId" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml
index 2d5ed02..16399de 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TUserTagMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TUserTagMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TUserTag">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TUserTag">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="standard_condition" property="standardCondition" />
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVehicleRampMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVehicleRampMapper.xml
deleted file mode 100644
index bbc6445..0000000
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVehicleRampMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.chargingPile.mapper.TVehicleRampMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TVehicleRamp">
- <id column="id" property="id" />
- <result column="parking_lot_id" property="parkingLotId" />
- <result column="carport_id" property="carportId" />
- <result column="name" property="name" />
- <result column="direction" property="direction" />
- <result column="carport_num" property="carportNum" />
- <result column="create_time" property="createTime" />
- <result column="del_flag" property="delFlag" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, parking_lot_id, carport_id, name, direction, carport_num, create_time, del_flag
- </sql>
-
-</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml
index ce204e5..941a10c 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/TVipMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TVipMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TVip">
+ <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TVip">
<id column="id" property="id" />
<result column="name" property="name" />
<result column="reveal" property="reveal" />
@@ -39,5 +39,11 @@
<sql id="Base_Column_List">
id, name, reveal, monthly_card, monthly_card_reveal, monthly_card_discount, monthly_card_discount_start, monthly_card_discount_end, monthly_card_discount_reveal, season_card, season_card_reveal, season_card_discount, season_card_discount_start, season_card_discount_end, season_card_discount_reveal, annual_card, annual_card_reveal, annual_card_discount, annual_card_discount_start, annual_card_discount_end, annual_card_discount_reveal, discount_times, maximum_deduction, deduction_type, coupon, double_integration, mall_exclusive_price, create_time, del_flag
</sql>
+ <select id="pageList" resultType="com.ruoyi.other.api.domain.TVip">
+ select * from t_vip
+ where
+ del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
+ ORDER BY create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1