From 1d429b7c98f8f15c63a6dba03ff90dae7a984e58 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 十一月 2024 10:32:33 +0800
Subject: [PATCH] 修改配置文件
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java | 8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java | 3
.gitignore | 2
ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java | 134 -------------
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java | 15 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java | 11 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java | 7
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java | 11
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java | 50 -----
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java | 2
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java | 8
/dev/null | 15 -
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 11 -
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 60 -----
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 29 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java | 6
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/IAppUserService.java | 11 +
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java | 115 +++++++++++
ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 34 +++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 25 ++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 42 ----
22 files changed, 258 insertions(+), 342 deletions(-)
diff --git a/.gitignore b/.gitignore
index 270715f..09e64c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@
target
+*.yaml
+*.yml
*.log
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
deleted file mode 100644
index e742c91..0000000
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-//package com.ruoyi.account.api.factory;
-//
-//import com.ruoyi.common.core.domain.R;
-//import com.ruoyi.common.core.web.page.PageInfo;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.cloud.openfeign.FallbackFactory;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-///**
-// * 门店服务降级处理
-// *
-// * @author ruoyi
-// */
-//@Component
-//public class AppCouponFallbackFactory implements FallbackFactory<AppCouponClient>
-//{
-// private static final Logger log = LoggerFactory.getLogger(AppCouponFallbackFactory.class);
-//
-// @Override
-// public AppCouponClient create(Throwable throwable) {
-// log.error("用户优惠券记录调用失败:{}", throwable.getMessage());
-// return new AppCouponClient() {
-//
-// @Override
-// public R<List<Integer>> getCountByCouponIds(String couponIds) {
-// return null;
-// }
-//
-// @Override
-// public R<Integer> getUseCountByCouponId(Integer couponId) {
-// return null;
-// }
-//
-// @Override
-// public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
-// return R.fail("根据优惠券id查询领取记录:"+throwable.getMessage());
-// }
-//
-// @Override
-// public R grantCoupon(GrantCouponDto dto) {
-// return R.fail("给用户发放优惠券:"+throwable.getMessage());
-// }
-//
-// @Override
-// public R refund(String id) {
-// return R.fail("后台退款 退回优惠券失败:"+throwable.getMessage());
-// }
-//
-// @Override
-// public R<TAppCoupon> getAppCouponById(Long id) {
-// return R.fail("根据id获取优惠券领取记录失败：" + throwable.getMessage());
-// }
-//
-// @Override
-// public R updateAppCoupon(TAppCoupon appCoupon) {
-// return R.fail("修改用户优惠券失败：" + throwable.getMessage());
-// }
-// };
-// }
-//}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
new file mode 100644
index 0000000..a754d8b
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -0,0 +1,29 @@
+package com.ruoyi.account.api.factory;
+
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:52
+ */
+@Slf4j
+public class AppUserClientFallbackFactory implements FallbackFactory<AppUserClient> {
+
+
+
+ @Override
+ public AppUserClient create(Throwable cause) {
+
+ return new AppUserClient() {
+ @Override
+ public AppUser getAppUserById(Long id) {
+ log.error("根据id获取用户失败：" + cause.getMessage());
+ throw new RuntimeException("根据id获取用户失败");
+ }
+
+ };
+ }
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
new file mode 100644
index 0000000..1d94198
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -0,0 +1,25 @@
+package com.ruoyi.account.api.feignClient;
+
+import com.ruoyi.account.api.factory.AppUserClientFallbackFactory;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:50
+ */
+@FeignClient(contextId = "AppUserClient", value = ServiceNameConstants.ACCOUNT_SERVICE, fallbackFactory = AppUserClientFallbackFactory.class)
+public interface AppUserClient {
+
+ /**
+ * 根据id获取用户
+ * @param id
+ * @return
+ */
+ @PostMapping("/appUser/getAppUserById")
+ AppUser getAppUserById(@RequestParam("id") Long id);
+
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
new file mode 100644
index 0000000..4fe1856
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -0,0 +1,115 @@
+package com.ruoyi.account.api.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 用户
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:25
+ */
+@Data
+@TableName("t_app_user")
+public class AppUser {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+ /**
+ * 用户名
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 手机号
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 头像
+ */
+ @TableField("avatar")
+ private String avatar;
+ /**
+ * 会员id
+ */
+ @TableField("vip_id")
+ private Integer vipId;
+ /**
+ * 微信openid
+ */
+ @TableField("wx_openid")
+ private String wxOpenid;
+ /**
+ * 状态（1=正常，2=冻结，3=注销）
+ */
+ @TableField("status")
+ private Integer status;
+ /**
+ * 添加时间
+ */
+ @TableField("create_time")
+ private LocalDateTime createTime;
+ /**
+ * 删除（0=否，1=是）
+ */
+ @TableField("del_flag")
+ private Integer delFlag;
+ /**
+ * 0否1是第一次添加
+ */
+ @TableField("first_add")
+ private Integer firstAdd;
+ /**
+ * 最后一次登录时间
+ */
+ @TableField("last_login_time")
+ private LocalDateTime lastLoginTime;
+ /**
+ * 推广人id
+ */
+ @TableField("invite_user_id")
+ private Long inviteUserId;
+ /**
+ * 拥有门店id
+ */
+ @TableField("shop_id")
+ private Integer shopId;
+ /**
+ * 合伙人积分数
+ */
+ @TableField("part_point")
+ private Integer partPoint;
+ /**
+ * 合伙人培育积分数
+ */
+ @TableField("part_grow_point")
+ private Integer partGrowPoint;
+ /**
+ * 消费积分数
+ */
+ @TableField("shop_point")
+ private Integer shopPoint;
+ /**
+ * 返佣积分数
+ */
+ @TableField("share_point")
+ private Integer sharePoint;
+ /**
+ * 消费总金额
+ */
+ @TableField("shop_amount")
+ private BigDecimal shopAmount;
+ /**
+ * 最后消费时间
+ */
+ @TableField("last_shop_time")
+ private LocalDateTime lastShopTime;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index e69de29..332cd6d 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.account.api.factory.AppUserClientFallbackFactory
\ No newline at end of file
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
deleted file mode 100644
index dd60fd3..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTable.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("gen_table")
-@ApiModel(value="GenTable对象", description="")
-public class GenTable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "编号")
- @TableId(value = "table_id", type = IdType.AUTO)
- private Long tableId;
-
- @ApiModelProperty(value = "表名称")
- @TableField("table_name")
- private String tableName;
-
- @ApiModelProperty(value = "表描述")
- @TableField("table_comment")
- private String tableComment;
-
- @ApiModelProperty(value = "关联子表的表名")
- @TableField("sub_table_name")
- private String subTableName;
-
- @ApiModelProperty(value = "子表关联的外键名")
- @TableField("sub_table_fk_name")
- private String subTableFkName;
-
- @ApiModelProperty(value = "实体类名称")
- @TableField("class_name")
- private String className;
-
- @ApiModelProperty(value = "使用的模板（crud单表操作 tree树表操作）")
- @TableField("tpl_category")
- private String tplCategory;
-
- @ApiModelProperty(value = "生成包路径")
- @TableField("package_name")
- private String packageName;
-
- @ApiModelProperty(value = "生成模块名")
- @TableField("module_name")
- private String moduleName;
-
- @ApiModelProperty(value = "生成业务名")
- @TableField("business_name")
- private String businessName;
-
- @ApiModelProperty(value = "生成功能名")
- @TableField("function_name")
- private String functionName;
-
- @ApiModelProperty(value = "生成功能作者")
- @TableField("function_author")
- private String functionAuthor;
-
- @ApiModelProperty(value = "生成代码方式（0zip压缩包 1自定义路径）")
- @TableField("gen_type")
- private String genType;
-
- @ApiModelProperty(value = "生成路径（不填默认项目路径）")
- @TableField("gen_path")
- private String genPath;
-
- @ApiModelProperty(value = "其它生成选项")
- @TableField("options")
- private String options;
-
- @ApiModelProperty(value = "创建者")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "备注")
- @TableField("remark")
- private String remark;
-
-
-}
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
deleted file mode 100644
index 753d75e..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GenTableColumn.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("gen_table_column")
-@ApiModel(value="GenTableColumn对象", description="")
-public class GenTableColumn {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "编号")
- @TableId(value = "column_id", type = IdType.AUTO)
- private Long columnId;
-
- @ApiModelProperty(value = "归属表编号")
- @TableField("table_id")
- private String tableId;
-
- @ApiModelProperty(value = "列名称")
- @TableField("column_name")
- private String columnName;
-
- @ApiModelProperty(value = "列描述")
- @TableField("column_comment")
- private String columnComment;
-
- @ApiModelProperty(value = "列类型")
- @TableField("column_type")
- private String columnType;
-
- @ApiModelProperty(value = "JAVA类型")
- @TableField("java_type")
- private String javaType;
-
- @ApiModelProperty(value = "JAVA字段名")
- @TableField("java_field")
- private String javaField;
-
- @ApiModelProperty(value = "是否主键（1是）")
- @TableField("is_pk")
- private String isPk;
-
- @ApiModelProperty(value = "是否自增（1是）")
- @TableField("is_increment")
- private String isIncrement;
-
- @ApiModelProperty(value = "是否必填（1是）")
- @TableField("is_required")
- private String isRequired;
-
- @ApiModelProperty(value = "是否为插入字段（1是）")
- @TableField("is_insert")
- private String isInsert;
-
- @ApiModelProperty(value = "是否编辑字段（1是）")
- @TableField("is_edit")
- private String isEdit;
-
- @ApiModelProperty(value = "是否列表字段（1是）")
- @TableField("is_list")
- private String isList;
-
- @ApiModelProperty(value = "是否查询字段（1是）")
- @TableField("is_query")
- private String isQuery;
-
- @ApiModelProperty(value = "查询方式（等于、不等于、大于、小于、范围）")
- @TableField("query_type")
- private String queryType;
-
- @ApiModelProperty(value = "显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）")
- @TableField("html_type")
- private String htmlType;
-
- @ApiModelProperty(value = "字典类型")
- @TableField("dict_type")
- private String dictType;
-
- @ApiModelProperty(value = "排序")
- @TableField("sort")
- private Integer sort;
-
- @ApiModelProperty(value = "创建者")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateTime;
-
-
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
deleted file mode 100644
index c395dd9..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Region.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author zhibing.pu
- * @Date 2024/8/8 11:55
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_region")
-@ApiModel(value="Region对象", description="")
-public class Region {
- /**
- * 主键
- */
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
- /**
- * 城市名称
- */
- @TableField("name")
- private String name;
- /**
- * 行政区划代码
- */
- @TableField("code")
- private String code;
- /**
- * 城市code
- */
- @TableField("citycode")
- private String citycode;
- /**
- * 父级ID
- */
- @TableField("parent_id")
- private Integer parentId;
- /**
- * 英文名称
- */
- @TableField("english")
- private String english;
-}
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
deleted file mode 100644
index 9842ed4..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictData.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_dict_data")
-@ApiModel(value="SysDictData对象", description="")
-public class SysDictData {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "字典编码")
- @TableId(value = "dict_code", type = IdType.AUTO)
- private Long dictCode;
-
- @ApiModelProperty(value = "字典排序")
- @TableField("dict_sort")
- private Integer dictSort;
-
- @ApiModelProperty(value = "字典标签")
- @TableField("dict_label")
- private String dictLabel;
-
- @ApiModelProperty(value = "字典键值")
- @TableField("dict_value")
- private String dictValue;
-
- @ApiModelProperty(value = "字典类型")
- @TableField("dict_type")
- private String dictType;
-
- @ApiModelProperty(value = "样式属性（其他样式扩展）")
- @TableField("css_class")
- private String cssClass;
-
- @ApiModelProperty(value = "表格回显样式")
- @TableField("list_class")
- private String listClass;
-
- @ApiModelProperty(value = "是否默认（Y是 N否）")
- @TableField("is_default")
- private String isDefault;
-
- @ApiModelProperty(value = "状态（0正常 1停用）")
- @TableField("status")
- private String status;
-
- @ApiModelProperty(value = "创建者")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "备注")
- @TableField("remark")
- private String remark;
-
-
-}
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
deleted file mode 100644
index e87b6a5..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysDictType.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_dict_type")
-@ApiModel(value="SysDictType对象", description="")
-public class SysDictType {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "字典主键")
- @TableId(value = "dict_id", type = IdType.AUTO)
- private Long dictId;
-
- @ApiModelProperty(value = "字典名称")
- @TableField("dict_name")
- private String dictName;
-
- @ApiModelProperty(value = "字典类型")
- @TableField("dict_type")
- private String dictType;
-
- @ApiModelProperty(value = "状态（0正常 1停用）")
- @TableField("status")
- private String status;
-
- @ApiModelProperty(value = "创建者")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "备注")
- @TableField("remark")
- private String remark;
-
-
-}
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
deleted file mode 100644
index 43c5723..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SysNotice.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.sql.Blob;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("sys_notice")
-@ApiModel(value="SysNotice对象", description="")
-public class SysNotice {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "公告ID")
- @TableId(value = "notice_id", type = IdType.AUTO)
- private Integer noticeId;
-
- @ApiModelProperty(value = "公告标题")
- @TableField("notice_title")
- private String noticeTitle;
-
- @ApiModelProperty(value = "公告类型（1通知 2公告）")
- @TableField("notice_type")
- private String noticeType;
-
- @ApiModelProperty(value = "公告内容")
- @TableField("notice_content")
- private String noticeContent;
-
- @ApiModelProperty(value = "公告状态（0正常 1关闭）")
- @TableField("status")
- private String status;
-
- @ApiModelProperty(value = "创建者")
- @TableField("create_by")
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField("update_by")
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "备注")
- @TableField("remark")
- private String remark;
-
-
-}
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
deleted file mode 100644
index dcab664..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_activity")
-@ApiModel(value="TActivity对象", description="")
-public class TActivity extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "活动标题")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "活动图地址")
- @TableField("img")
- private String img;
-
- @ApiModelProperty(value = "开始时间")
- @TableField("start_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime startTime;
-
- @ApiModelProperty(value = "结束时间")
- @TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime endTime;
-
- @ApiModelProperty(value = "跳转类型（1=小程序内页面，2=小程序地址，3=网页地址）")
- @TableField("jump_type")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转链接")
- @TableField("jump_url")
- private String jumpUrl;
-
- @ApiModelProperty(value = "上架状态（0=否，1=是）")
- @TableField("status")
- private Integer status;
- @ApiModelProperty(value = "小程序id")
- @TableField("applet_id")
- private String appletId;
- @ApiModelProperty(value = "小程序名称")
- @TableField("applet_name")
- private String appletName;
- @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/TAdvertising.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java
deleted file mode 100644
index 02ba4a2..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TAdvertising.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_advertising")
-@ApiModel(value="TAdvertising对象", description="")
-public class TAdvertising extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "广告图地址")
- @TableField("img")
- private String img;
-
- @ApiModelProperty(value = "开始时间")
- @TableField("start_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime startTime;
-
- @ApiModelProperty(value = "结束时间")
- @TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime endTime;
-
- @ApiModelProperty(value = "显示位置（1=banner广告，2=弹出广告）")
- @TableField("position")
- private Integer position;
-
- @ApiModelProperty(value = "跳转类型（1=小程序内页面，2=小程序地址，3=网页地址）")
- @TableField("jump_type")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转链接")
- @TableField("jump_url")
- private String jumpUrl;
-
- @ApiModelProperty(value = "上架状态（0=否，1=是）")
- @TableField("status")
- private Integer status;
- @ApiModelProperty(value = "小程序id")
- @TableField("applet_id")
- private String appletId;
- @ApiModelProperty(value = "小程序名称")
- @TableField("applet_name")
- private String appletName;
-
- @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
deleted file mode 100644
index 6136683..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
+++ /dev/null
@@ -1,51 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_company")
-@ApiModel(value="TCompany对象", description="")
-public class TCompany extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "单位编号")
- @TableField("code")
- private String code;
-
- @ApiModelProperty(value = "单位名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "备注")
- @TableField("remark")
- private String remark;
-
-
- @ApiModelProperty(value = "人数")
- @TableField(exist = false)
- private Long userCount;
-
-
-}
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
deleted file mode 100644
index 5a99b2a..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCoupon.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_coupon")
-@ApiModel(value="TCoupon对象", description="")
-public class TCoupon extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "类型（1=充电优惠券，2=购物优惠券）")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "优惠券名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "封面图")
- @TableField("cover_picture")
- private String coverPicture;
-
- @ApiModelProperty(value = "详情图片")
- @TableField("details_picture")
- private String detailsPicture;
-
- @ApiModelProperty(value = "优惠方式（1=满减，2=抵扣）")
- @TableField("preferential_mode")
- private Integer preferentialMode;
-
- @ApiModelProperty(value = "优惠金额")
- @TableField("discount_amount")
- private BigDecimal discountAmount;
-
- @ApiModelProperty(value = "满减条件")
- @TableField("meet_the_conditions")
- private BigDecimal meetTheConditions;
-
- @ApiModelProperty(value = "折扣")
- @TableField("discount")
- private BigDecimal discount;
-
- @ApiModelProperty(value = "最高优惠金额")
- @TableField("maximum_discount_amount")
- private BigDecimal maximumDiscountAmount;
-
- @ApiModelProperty(value = "库存数量（-1表示不限制）")
- @TableField("inventory_quantity")
- private Integer inventoryQuantity;
-
- @ApiModelProperty(value = "有效期方式（1=使用截止时间，2=获取截止时间）")
- @TableField("validity_period_mode")
- private Integer validityPeriodMode;
-
- @ApiModelProperty(value = "使用截止时间")
- @TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime endTime;
-
- @ApiModelProperty(value = "获取后有效天数")
- @TableField("days")
- private Integer days;
-
- @ApiModelProperty(value = "获得方式（1=积分兑换，2=现金购买）")
- @TableField("ways_to_obtain")
- private Integer waysToObtain;
-
- @ApiModelProperty(value = "兑换积分")
- @TableField("redeem_points")
- private Integer redeemPoints;
-
- @ApiModelProperty(value = "每人兑换限额（-1表示不限制）")
- @TableField("exchange_limit")
- private Integer exchangeLimit;
-
- @ApiModelProperty(value = "支付金额")
- @TableField("payment_amount")
- private BigDecimal paymentAmount;
-
- @ApiModelProperty(value = "会员支付金额")
- @TableField("vip_payment_amount")
- private BigDecimal vipPaymentAmount;
-
- @ApiModelProperty(value = "优惠券说明")
- @TableField("explains")
- private String explains;
-
- @ApiModelProperty(value = "说明")
- @TableField("remark")
- private String remark;
- @ApiModelProperty(value = "状态（1=上架，2=下架）")
- @TableField("status")
- private Integer status;
- @ApiModelProperty(value = "发放数量")
- @TableField(exist = false)
- private Integer count;
- @ApiModelProperty(value = "使用数量")
- @TableField(exist = false)
- private Integer useCount;
-
- @ApiModelProperty(value = "销量")
- @TableField(exist = false)
- private Integer salesCount;
-
-
-
-}
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
deleted file mode 100644
index 32002ab..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEnterpriseUserApplication.java
+++ /dev/null
@@ -1,66 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_enterprise_user_application")
-@ApiModel(value="TEnterpriseUserApplication对象", description="")
-public class TEnterpriseUserApplication extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "用户id")
- @TableField("app_user_id")
- private Long appUserId;
-
- @ApiModelProperty(value = "公司名称")
- @NotBlank(message = "公司名称不能为空")
- @TableField("company_name")
- private String companyName;
-
- @ApiModelProperty(value = "汽车数量")
- @NotNull(message = "汽车数量不能为空")
- @TableField("vehicles_number")
- private Integer vehiclesNumber;
-
- @ApiModelProperty(value = "联系人姓名")
- @NotBlank(message = "联系人姓名不能为空")
- @TableField("contact_name")
- private String contactName;
-
- @ApiModelProperty(value = "联系人电话")
- @NotBlank(message = "联系人电话不能为空")
- @TableField("phone")
- private String phone;
-
- @ApiModelProperty(value = "注释")
- @TableField("remark")
- private String remark;
-
-
-
-
-}
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
deleted file mode 100644
index cc5cdcc..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TEvaluationTag.java
+++ /dev/null
@@ -1,44 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_evaluation_tag")
-@ApiModel(value="TEvaluationTag对象", description="")
-public class TEvaluationTag extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "标签名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "评价类型（1=好评，2=中评，3=差评）")
- @TableField("type")
- private Integer type;
-
-
-
-
-}
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
deleted file mode 100644
index 120fefe..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TGoods.java
+++ /dev/null
@@ -1,110 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_goods")
-@ApiModel(value="TGoods对象", description="")
-public class TGoods extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "商品类型（1=购买商品，2=兑换商品）")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "商品名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "封面图")
- @TableField("cover_picture")
- private String coverPicture;
-
- @ApiModelProperty(value = "详情图片")
- @TableField("details_picture")
- private String detailsPicture;
-
- @ApiModelProperty(value = "发货地")
- @TableField("dispatch_address")
- private String dispatchAddress;
-
- @ApiModelProperty(value = "服务说明")
- @TableField("service_description")
- private String serviceDescription;
-
- @ApiModelProperty(value = "原价")
- @TableField("original_price")
- private BigDecimal originalPrice;
-
- @ApiModelProperty(value = "优惠价")
- @TableField("preferential_price")
- private BigDecimal preferentialPrice;
-
- @ApiModelProperty(value = "会员价")
- @TableField("vip_price")
- private BigDecimal vipPrice;
-
- @ApiModelProperty(value = "兑换积分")
- @TableField("redeem_points")
- private Integer redeemPoints;
-
- @ApiModelProperty(value = "限制兑换次数（-1表示不限制）")
- @TableField("limit_exchange_times")
- private Integer limitExchangeTimes;
-
- @ApiModelProperty(value = "库存数量（-1表示不限库存）")
- @TableField("inventory")
- private Integer inventory;
-
- @ApiModelProperty(value = "基础销量")
- @TableField("underlying_sales")
- private Integer underlyingSales;
-
- @ApiModelProperty(value = "商品描述")
- @TableField("describes")
- private String describes;
-
- @ApiModelProperty(value = "商品介绍")
- @TableField("introduce")
- private String introduce;
-
- @ApiModelProperty(value = "商品说明")
- @TableField("explains")
- private String explains;
-
- @ApiModelProperty(value = "状态（1=上架，2=下架）")
- @TableField("status")
- private Integer status;
-
-
- @ApiModelProperty(value = "销量")
- @TableField(exist = false)
- private Integer salesCount;
- @ApiModelProperty(value = "1商品2优惠卷")
- @TableField(exist = false)
- private Integer goodType;
-
-}
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
deleted file mode 100644
index 553d1cb..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_html")
-@ApiModel(value="THtml对象", description="")
-public class THtml {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "数据类型（1=积分规则说明，2=会员折扣说明，3=优惠券说明，4=双倍积分说明，5=商城专享价说明，6=会员协议，7=用户协议，8=隐私协议，9=邀请好友说明，10=资质证明，11=开票说明）")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "内容")
- @TableField("content")
- private String content;
-
-
-}
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
deleted file mode 100644
index 453926a..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_integral_rule")
-@ApiModel(value="TIntegralRule对象", description="")
-public class TIntegralRule {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "充电得积分{\"num1\":1}")
- @TableField("charge_credit")
- private String chargeCredit;
-
- @ApiModelProperty(value = "好评得积分{\"num1\":1}")
- @TableField("credit")
- private String credit;
-
- @ApiModelProperty(value = "添加车辆得积分{\"num1\":1,\"num2\":1,\"num3\":1,\"num4\":1}")
- @TableField("add_vehicles_earns_points")
- private String addVehiclesEarnsPoints;
-
- @ApiModelProperty(value = "邀请用户得积分{\"num1\":1}")
- @TableField("invite_users_to_earn_points")
- private String inviteUsersToEarnPoints;
-
- @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}")
- @TableField("sign_in_for_points")
- private String signInForPoints;
- @ApiModelProperty(value = "是否双倍")
- @TableField(exist = false)
- private Integer isDouble;
-
-
-}
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
deleted file mode 100644
index e0be5a0..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TInvoiceType.java
+++ /dev/null
@@ -1,61 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_invoice_type")
-@ApiModel(value="TInvoiceType对象", description="")
-public class TInvoiceType extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "发票类型名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "开票公司名称")
- @TableField("invoicing_company")
- private String invoicingCompany;
-
- @ApiModelProperty(value = "开票方式（1=人工，2=自动）")
- @TableField("invoicing_method")
- private Integer invoicingMethod;
-
- @ApiModelProperty(value = "电费税率")
- @TableField("electricity_tariff")
- private BigDecimal electricityTariff;
-
- @ApiModelProperty(value = "服务费税率")
- @TableField("service_tariff")
- private BigDecimal serviceTariff;
-
- @ApiModelProperty(value = "增值服务费税率")
- @TableField("added_service_tariff")
- private BigDecimal addedServiceTariff;
-
-
-
-
-}
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
deleted file mode 100644
index b1023e7..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TNotice.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_notice")
-@ApiModel(value="TNotice对象", description="")
-public class TNotice extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId("id")
- private Integer id;
-
- @ApiModelProperty(value = "公告内容")
- @TableField("content")
- private String content;
-
- @ApiModelProperty(value = "开始时间")
- @TableField("start_time")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private LocalDate startTime;
-
- @ApiModelProperty(value = "结束时间")
- @TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private LocalDate endTime;
-
-
-
-}
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
deleted file mode 100644
index dd30781..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TRoleSite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_role_site")
-@ApiModel(value="TRoleSite对象", description="")
-public class TRoleSite {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "角色id")
- @TableField("role_id")
- private Integer roleId;
-
- @ApiModelProperty(value = "站点id")
- @TableField("site_id")
- private Integer siteId;
-
-
-}
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
deleted file mode 100644
index 1a43603..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_system_configuration")
-@ApiModel(value="TSystemConfiguration对象", description="")
-public class TSystemConfiguration implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "数据类型（1=客服信息，2=系统设置）")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "设置内容JSON{\"num1\":1,\"num2\":1}")
- @TableField("content")
- private String content;
-
-
-}
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
deleted file mode 100644
index 3698149..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserSite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_user_site")
-@ApiModel(value="TUserSite对象", description="")
-public class TUserSite {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "用户id")
- @TableField("user_id")
- private Integer userId;
-
- @ApiModelProperty(value = "站点id")
- @TableField("site_id")
- private Integer siteId;
-
-
-}
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
deleted file mode 100644
index 9449897..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
+++ /dev/null
@@ -1,58 +0,0 @@
-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;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_user_tag")
-@ApiModel(value="TUserTag对象", description="")
-public class TUserTag extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "标签名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "达标要求（1=累计次数，2=充电评率）")
- @TableField("standard_condition")
- private Integer standardCondition;
-
- @ApiModelProperty(value = "达标条件值JSON（{\"day\":1,\"times\":5}）")
- @TableField("conditions")
- private String conditions;
-
-
-
-
- @ApiModelProperty(value = "到达人数")
- @TableField(exist = false)
- private Long count;
-
- @ApiModelProperty(value = "前端展示用")
- @TableField("type")
- private Integer type;
-
-
-
-}
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
deleted file mode 100644
index 93d41af..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.ruoyi.other.api.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 无关风月
- * @since 2024-08-06
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("t_vip")
-@ApiModel(value="TVip对象", description="")
-public class TVip extends BasePojo {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "会员名称")
- @TableField("name")
- private String name;
-
- @ApiModelProperty(value = "前端是否显示（0=否，1=是）")
- @TableField("reveal")
- private Integer reveal;
-
- @ApiModelProperty(value = "月卡价格")
- @TableField("monthly_card")
- private BigDecimal monthlyCard;
-
- @ApiModelProperty(value = "月卡显示（0=否，1=是）")
- @TableField("monthly_card_reveal")
- private Integer monthlyCardReveal;
-
- @ApiModelProperty(value = "月卡折扣")
- @TableField("monthly_card_discount")
- private BigDecimal monthlyCardDiscount;
-
- @ApiModelProperty(value = "月卡折扣开始时间")
- @TableField("monthly_card_discount_start")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime monthlyCardDiscountStart;
-
- @ApiModelProperty(value = "月卡折扣结束时间")
- @TableField("monthly_card_discount_end")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime monthlyCardDiscountEnd;
-
- @ApiModelProperty(value = "月卡折扣显示（0=否，1=是）")
- @TableField("monthly_card_discount_reveal")
- private Integer monthlyCardDiscountReveal;
-
- @ApiModelProperty(value = "季卡价格")
- @TableField("season_card")
- private BigDecimal seasonCard;
-
- @ApiModelProperty(value = "季卡显示（0=否，1=是）")
- @TableField("season_card_reveal")
- private Integer seasonCardReveal;
-
- @ApiModelProperty(value = "季卡折扣")
- @TableField("season_card_discount")
- private BigDecimal seasonCardDiscount;
-
- @ApiModelProperty(value = "季卡折扣开始时间")
- @TableField("season_card_discount_start")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime seasonCardDiscountStart;
-
- @ApiModelProperty(value = "季卡折扣结束时间")
- @TableField("season_card_discount_end")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime seasonCardDiscountEnd;
-
- @ApiModelProperty(value = "季卡折扣显示（0=否，1=是）")
- @TableField("season_card_discount_reveal")
- private Integer seasonCardDiscountReveal;
-
- @ApiModelProperty(value = "年卡价格")
- @TableField("annual_card")
- private BigDecimal annualCard;
-
- @ApiModelProperty(value = "年卡显示（0=否，1=是）")
- @TableField("annual_card_reveal")
- private Integer annualCardReveal;
-
- @ApiModelProperty(value = "年卡折扣")
- @TableField("annual_card_discount")
- private BigDecimal annualCardDiscount;
-
- @ApiModelProperty(value = "年卡折扣开始时间")
- @TableField("annual_card_discount_start")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime annualCardDiscountStart;
-
- @ApiModelProperty(value = "年卡折扣结束时间")
- @TableField("annual_card_discount_end")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- private LocalDateTime annualCardDiscountEnd;
-
- @ApiModelProperty(value = "年卡折扣显示（0=否，1=是）")
- @TableField("annual_card_discount_reveal")
- private Integer annualCardDiscountReveal;
-
- @ApiModelProperty(value = "折扣次数")
- @TableField("discount_times")
- private Integer discountTimes;
-
- @ApiModelProperty(value = "最高抵扣金额")
- @TableField("maximum_deduction")
- private BigDecimal maximumDeduction;
-
- @ApiModelProperty(value = "抵扣类型（1=服务费）")
- @TableField("deduction_type")
- private Integer deductionType;
-
- @ApiModelProperty(value = "优惠券[{\"id\":1,\"number\":1}]")
- @TableField("coupon")
- private String coupon;
-
- @ApiModelProperty(value = "双倍积分开关（0=否，1=是）")
- @TableField("double_integration")
- private Integer doubleIntegration;
-
- @ApiModelProperty(value = "商城专享价开关（0=否，1=是）")
- @TableField("mall_exclusive_price")
- private Integer mallExclusivePrice;
- @ApiModelProperty(value = "内部会员折扣")
- @TableField("discount")
- private BigDecimal discount;
- @ApiModelProperty(value = "添加的会员类型 1常规 2内部")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "优惠券名称和张数 后台列表展示使用")
- @TableField(exist = false)
- private String couponName;
-
-
-}
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
deleted file mode 100644
index 894ae32..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-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/GoodsDTO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/GoodsDTO.java
deleted file mode 100644
index 5f79b6b..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/GoodsDTO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-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 GoodsDTO extends BasePage {
- @ApiModelProperty(value = "商品状态 1上架 2下架")
- private Integer status;
- @ApiModelProperty(value = "商品名称")
- private String name;
- @ApiModelProperty(value = "1现金购买 2积分兑换 ")
- private Integer type;
- @ApiModelProperty(value = "1全部 2已售罄 3已下架")
- private Integer otherState;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/NoticeQueryDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/NoticeQueryDto.java
deleted file mode 100644
index 879c7cd..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/NoticeQueryDto.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import com.ruoyi.common.core.web.page.BasePage;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class NoticeQueryDto extends BasePage {
- private String content;
- @ApiModelProperty("0未开始1已开始2已结束")
- private Integer status;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveHtml.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveHtml.java
deleted file mode 100644
index 2924cb0..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveHtml.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-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 SaveHtml extends BasePage {
-
- @ApiModelProperty(value = "数据类型（1=积分规则说明，2=会员折扣说明，3=优惠券说明，4=双倍积分说明，5=商城专享价说明，6=会员协议，7=用户协议，8=隐私协议，9=邀请好友说明，10=资质证明，11=开票说明）")
- private Integer type;
- @ApiModelProperty(value = "标题")
- private String info;
-
-
-}
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
deleted file mode 100644
index 754e53e..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel("保存修改-查看详情积分规则DTO")
-public class SaveIntegralDTO {
-
- @ApiModelProperty(value = "id")
- private Integer id;
- @ApiModelProperty(value = "充电得积分{\"num1\":1}")
- private String chargeCredit;
- @ApiModelProperty(value = "好评得积分{\"num1\":1}")
- private String credit;
- @ApiModelProperty(value = "添加车辆得积分{\"num1\":1,\"num2\":1,\"num3\":1,\"num4\":1}")
- private String addVehiclesEarnsPoints;
- @ApiModelProperty(value = "邀请用户得积分{\"num1\":1}")
- private String invite_users_to_earn_points;
- @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[{\"num1\":1,\"num2\":1}]}")
- private String signInForPoints;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/TagListQueryDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/TagListQueryDto.java
deleted file mode 100644
index f82718f..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/TagListQueryDto.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import com.ruoyi.common.core.web.page.BasePage;
-import lombok.Data;
-
-@Data
-public class TagListQueryDto extends BasePage {
- private String tagName;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/UnitListQueryDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/UnitListQueryDto.java
deleted file mode 100644
index effd666..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/UnitListQueryDto.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import com.ruoyi.common.core.web.page.BasePage;
-import lombok.Data;
-
-@Data
-public class UnitListQueryDto extends BasePage {
- private String companyName;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipCouponDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipCouponDto.java
deleted file mode 100644
index f725386..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipCouponDto.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import com.ruoyi.other.api.domain.TCoupon;
-import lombok.Data;
-
-@Data
-public class VipCouponDto {
- private TCoupon tCoupon;
- private Integer num;
- }
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java
deleted file mode 100644
index be390c2..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.License;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-@Data
-public class VipInfoDto {
- private Integer id;
- @ApiModelProperty("月卡价格")
- private BigDecimal monthlyCard;
- @ApiModelProperty(value = "月卡折扣")
- private BigDecimal monthlyCardDiscount;
- @ApiModelProperty("季卡价格")
- private BigDecimal seasonCard;
- @ApiModelProperty(value = "季卡折扣")
- private BigDecimal seasonCardDiscount;
- @ApiModelProperty("年卡价格")
- private BigDecimal annualCard;
- @ApiModelProperty(value = "年卡折扣")
- private BigDecimal annualCardDiscount;
- @ApiModelProperty("最高抵扣价格")
- private BigDecimal maximumDeduction;
- private BigDecimal timeAmount;
- @ApiModelProperty("抵扣次数")
- private Integer discountTimes;
-
- @ApiModelProperty(value = "双倍积分开关（0=否，1=是）")
- private Integer doubleIntegration;
-
- @ApiModelProperty(value = "商城专享价开关（0=否，1=是）")
- private Integer mallExclusivePrice;
- @ApiModelProperty(value = "可赠送的优惠卷列表")
-
- private List<VipCouponDto> vipCouponDtos;
-
- @ApiModelProperty(value = "最高总折扣")
- private BigDecimal totalDiscount;
-
- @ApiModelProperty(value = "会员名称")
- private String name;
- private Integer type;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/WebSocketMsg.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/WebSocketMsg.java
deleted file mode 100644
index 3b1405a..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/WebSocketMsg.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.other.api.dto;
-
-import lombok.Data;
-
-/**
- * @author zhibing.pu
- * @Date 2024/8/21 17:43
- */
-@Data
-public class WebSocketMsg {
- /**
- * 用户id
- */
- private Long userId;
- /**
- * 消息内容
- */
- private String msg;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/CouponListVOVO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/CouponListVOVO.java
deleted file mode 100644
index 93a3e18..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/CouponListVOVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.ruoyi.other.api.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.web.domain.BasePojo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@ApiModel("管理后台 优惠券兑换记录列表返回VO")
-public class CouponListVOVO extends BasePojo {
- @ApiModelProperty(value = "优惠券名称")
- private String couponName;
- @ApiModelProperty(value = "优惠方式 1满减 2折扣")
- private Integer preferentialMode;
- @ApiModelProperty(value = "满减--优惠金额")
- private BigDecimal discountAmount;
- @ApiModelProperty(value = "满减--使用门槛 满减条件")
- private BigDecimal meetTheConditions;
- @ApiModelProperty(value = "折扣--折扣")
- private BigDecimal discount;
- @ApiModelProperty(value = "折扣--最高折扣金额")
- private BigDecimal maximumDiscountAmount;
- @ApiModelProperty(value = "优惠券数量")
- private Integer couponCount;
- @ApiModelProperty(value = "有效期")
- private String validityTime;
- @ApiModelProperty(value = "结束时间 前端忽略")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime endTime;
- @ApiModelProperty(value = "是否可用")
- private Integer isUse;
- @ApiModelProperty(value = "优惠券id")
- private Long couponId;
- @ApiModelProperty(value = "使用了优惠券后的服务费 用于判断哪一张优惠券优惠力度最大 前端忽略")
- private BigDecimal money;
- @ApiModelProperty(value = "当前用户是否为会员0否1是 前端忽略")
- private Integer isVip;
-}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/TEvaluationTagVO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/TEvaluationTagVO.java
deleted file mode 100644
index 49e0e4a..0000000
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/vo/TEvaluationTagVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.ruoyi.other.api.vo;
-
-import com.ruoyi.other.api.domain.TEvaluationTag;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "TEvaluationTagVO对象", description = "评价标签")
-public class TEvaluationTagVO extends TEvaluationTag{
-
- @ApiModelProperty(value = "评价标签数量")
- private Integer tagCount;
-
-}
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index da2ac38..6b128cc 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -3,12 +3,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.chargingPile.api.feignClient.PartnerClient;
-import com.ruoyi.chargingPile.api.model.Partner;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import io.seata.spring.annotation.GlobalTransactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -42,15 +39,11 @@
@Resource
private SysUserClient userClient;
- @Resource
- private PartnerClient partnerClient;
-
@PostMapping("login")
- @GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public R<?> login(@RequestBody LoginBody form, HttpServletRequest request) {
// 用户登录
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), request);
@@ -63,10 +56,6 @@
map.put("roleName",roles.get(0).getRoleName());
map.put("info", userInfo);
- if(userInfo.getSysUser().getRoleType() == 2){
- Partner partner = partnerClient.getPartnerById(userInfo.getSysUser().getObjectId()).getData();
- map.put("partnerName", partner.getName());
- }
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
sysUser.setUserId(userInfo.getSysUser().getUserId());
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
index 9cb4b54..ae331a6 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java
@@ -22,9 +22,6 @@
*/
public static final String FILE_SERVICE = "ruoyi-file";
public static final String ACCOUNT_SERVICE = "ruoyi-account";
- public static final String CHARGINGPILE_SERVICE = "ruoyi-chargingPile";
public static final String OTHER_SERVICE = "ruoyi-other";
public static final String ORDER_SERVICE = "ruoyi-order";
- public static final String INTEGRATION_SERVICE = "ruoyi-integration";
- public static final String PAYMENT_SERVICE = "ruoyi-payment";
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
index ebe7214..595f775 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -1,25 +1,16 @@
package com.ruoyi.system.controller;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.annotation.Resource;
-import javax.management.relation.Role;
-import javax.servlet.http.HttpServletResponse;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.other.api.domain.TRoleSite;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.system.api.model.GetSysRoleByIds;
import com.ruoyi.system.domain.SysMenus;
import com.ruoyi.system.domain.SysRoleMenu;
@@ -79,12 +70,6 @@
@Resource
private SysMenuMapper menuMapper;
- @Resource
- private RoleSiteClient roleSiteClient;
-
- @Resource
- private SiteClient siteClient;
-
@ApiOperation(value = "获取角色列表", tags = {"管理后台-系统用户管理"})
@GetMapping("/list")
@@ -106,12 +91,6 @@
PageInfo<SysRole> page = roleService.page(pageInfo, wrapper.orderByDesc(SysRole::getCreateTime));
for (SysRole record : page.getRecords()) {
- List<Integer> data = roleSiteClient.getSiteIds(record.getRoleId()).getData();
- List<Site> sites = siteClient.getSiteByIds(data).getData();
- if (null != sites) {
- List<String> collect = sites.stream().map(Site::getName).collect(Collectors.toList());
- record.setSiteNames(collect);
- }
long count = sysUserRoleService.count(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, record.getRoleId()));
record.setNumber(count);
}
@@ -141,15 +120,6 @@
role.setCreateBy(SecurityUtils.getUsername());
role.setCreateTime(new Date());
roleService.insertRole(role);
- //添加站点权限
- List<TRoleSite> roleSites = new ArrayList<>();
- for (Integer siteId : dto.getSiteIds()) {
- TRoleSite roleSite = new TRoleSite();
- roleSite.setRoleId(role.getRoleId().intValue());
- roleSite.setSiteId(siteId);
- roleSites.add(roleSite);
- }
- roleSiteClient.addRoleSite(roleSites);
return AjaxResult.success();
}
@@ -186,13 +156,6 @@
}
roleInfoVo.setMenus(menusId);
roleInfoVo.setRemark(role.getRemark());
- List<Integer> siteIds = roleSiteClient.getSiteIds(role.getRoleId()).getData();
- if (null != siteIds && siteIds.size() > 0) {
- List<Site> sites = siteClient.getSiteByIds(siteIds).getData();
- List<String> siteNames = sites.stream().map(Site::getName).collect(Collectors.toList());
- roleInfoVo.setSiteNames(siteNames);
- roleInfoVo.setSiteIds(siteIds);
- }
return AjaxResult.success(roleInfoVo);
}
@@ -236,19 +199,6 @@
sysRoleMenus.add(sysRoleMenu);
}
sysRoleMenuMapper.batchRoleMenu(sysRoleMenus);
- //删除旧站点数据
- roleSiteClient.delRoleSite(dto.getRoleId());
- //添加站点权限
- List<TRoleSite> roleSites = new ArrayList<>();
- if(null != dto.getSiteIds()){
- for (Integer siteId : dto.getSiteIds()) {
- TRoleSite roleSite = new TRoleSite();
- roleSite.setRoleId(role.getRoleId().intValue());
- roleSite.setSiteId(siteId);
- roleSites.add(roleSite);
- }
- }
- roleSiteClient.addRoleSite(roleSites);
return AjaxResult.success();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index d69b216..2bd9f2b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -6,20 +6,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.other.api.domain.TUserSite;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
-import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.api.model.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.query.GetSysUserList;
import com.ruoyi.system.query.ShopUserStart;
import com.ruoyi.system.service.*;
-import io.seata.core.context.RootContext;
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -72,15 +66,6 @@
@Resource
private ISysUserRoleService sysUserRoleService;
- @Resource
- private UserSiteClient userSiteClient;
-
- @Resource
- private RoleSiteClient roleSiteClient;
-
- @Resource
- private SiteClient siteClient;
-
@@ -132,14 +117,6 @@
sysUserRole.setUserId(user.getUserId());
userRoleService.insertSysUserRole(sysUserRole);
List<Integer> siteIds = user.getSiteIds();
- List<TUserSite> userSites = new ArrayList<>();
- for (Integer siteId : siteIds) {
- TUserSite userSite = new TUserSite();
- userSite.setUserId(user.getUserId().intValue());
- userSite.setSiteId(siteId);
- userSites.add(userSite);
- }
- userSiteClient.addUserSite(userSites);
return AjaxResult.success();
}
@@ -154,19 +131,7 @@
}
return success();
}
-
- @GetMapping("/getRoleSiteName/{roleId}")
- @ApiOperation(value = "获取角色对应的站点名称", tags = {"管理后台-系统用户管理"})
- public AjaxResult<List<String>> getRoleSiteName(@PathVariable Integer roleId){
- List<Integer> ids = roleSiteClient.getSiteIds(roleId.longValue()).getData();
- List<Site> data = siteClient.getSiteByIds(ids).getData();
- if(null == data){
- return AjaxResult.success(new ArrayList<>());
- }
- List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
- return AjaxResult.success(siteNames);
- }
-
+
@@ -181,17 +146,6 @@
List<SysRole> roles = roleService.selectRoleAll();
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
ajax.put("posts", postService.selectPostAll());
- if (StringUtils.isNotNull(userId)) {
- SysUser sysUser = userService.selectUserById(userId);
- List<Integer> siteIds = userSiteClient.getSiteIds(userId).getData();
- sysUser.setSiteIds(siteIds);
- List<Site> data = siteClient.getSiteByIds(siteIds).getData();
- List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
- sysUser.setSiteNames(siteNames);
- ajax.put(AjaxResult.DATA_TAG, sysUser);
- ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
- }
return AjaxResult.success(ajax);
}
@@ -243,18 +197,6 @@
user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateTime(new Date());
userService.updateUser(user);
-
- //删除旧的站点数据后添加新的
- userSiteClient.delUserSite(user.getUserId());
- List<Integer> siteIds = user.getSiteIds();
- List<TUserSite> userSites = new ArrayList<>();
- for (Integer siteId : siteIds) {
- TUserSite userSite = new TUserSite();
- userSite.setUserId(user.getUserId().intValue());
- userSite.setSiteId(siteId);
- userSites.add(userSite);
- }
- userSiteClient.addUserSite(userSites);
return success();
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
index b7e595a..8dffd0b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/filter/AuthFilter.java
@@ -2,17 +2,15 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.service.ISysUserService;
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -70,8 +68,8 @@
}
//小程序用户
if ("applet".equals(userType)) {
- TAppUser appUser = appUserClient.getUserById(Long.valueOf(userid)).getData();
- if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
+ AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
+ if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 673d496..6807712 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -10,12 +10,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.chargingPile.api.feignClient.SiteClient;
-import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.other.api.feignClient.RoleSiteClient;
-import com.ruoyi.other.api.feignClient.UserSiteClient;
import com.ruoyi.system.api.query.ChangeUserQuery;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
@@ -78,15 +74,6 @@
@Resource
private ISysUserRoleService sysUserRoleService;
-
- @Resource
- private RoleSiteClient roleSiteClient;
-
- @Resource
- private UserSiteClient userSiteClient;
-
- @Resource
- private SiteClient siteClient;
@Resource
private ISysRoleService sysRoleService;
@@ -528,35 +515,6 @@
@Override
public PageInfo<SysUser> getList(PageInfo<SysUser> pageInfo, GetSysUserList getSysUserList) {
List<SysUser> list = this.baseMapper.getList(pageInfo, getSysUserList);
- for (SysUser sysUser : list) {
- List<SysUserRole> list1 = sysUserRoleService.list(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
- List<Integer> data1 = userSiteClient.getSiteIds(sysUser.getUserId()).getData();
- if (null == data1) {
- data1 = new ArrayList<>();
- }
- for (SysUserRole sysUserRole : list1) {
- List<Integer> data = roleSiteClient.getSiteIds(sysUserRole.getRoleId()).getData();
- if (null == data) {
- continue;
- }
- data1.addAll(data);
- }
- Set<Integer> siteIds = new HashSet<>(data1);
- List<Site> data = siteClient.getSiteByIds(siteIds.stream().collect(Collectors.toList())).getData();
- if (null != data) {
- List<String> siteNames = data.stream().map(Site::getName).collect(Collectors.toList());
- sysUser.setSiteNames(siteNames);
- sysUser.setSiteIds(data.stream().map(Site::getId).collect(Collectors.toList()));
- }
- List<String> roleNames = new ArrayList<>();
- for (SysUserRole sysUserRole : list1) {
- SysRole sysRole = sysRoleService.selectRoleById(sysUserRole.getRoleId());
- roleNames.add(sysRole.getRoleName());
- }
- Long[] roleIds = new Long[]{};
- sysUser.setRoleIds(list1.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()).toArray(roleIds));
- sysUser.setRoleNames(roleNames);
- }
return pageInfo.setRecords(list);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
new file mode 100644
index 0000000..68fb379
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -0,0 +1,34 @@
+package com.ruoyi.account.controller;
+
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.service.IAppUserService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:47
+ */
+@RestController
+@RequestMapping("/appUser")
+public class AppUserController {
+
+ @Resource
+ private IAppUserService appUserService;
+
+
+ /**
+ * 根据id获取用户信息
+ * @param id
+ * @return
+ */
+ @PostMapping("/getAppUserById")
+ public AppUser getAppUserById(@RequestParam("id") Long id){
+ return appUserService.getById(id);
+ }
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
index 9cd72c2..b29ac94 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/filter/AuthFilter.java
@@ -1,8 +1,8 @@
package com.ruoyi.account.filter;
import com.alibaba.fastjson.JSON;
-import com.ruoyi.account.api.model.TAppUser;
-import com.ruoyi.account.service.TAppUserService;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.service.IAppUserService;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -11,7 +11,6 @@
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -36,7 +35,7 @@
@Lazy
@Resource
-// private TAppUserService appUserService;
+ private IAppUserService appUserService;
@Lazy
@Resource
@@ -74,8 +73,8 @@
}
//小程序用户
if ("applet".equals(userType)) {
- TAppUser appUser = appUserService.getById(userid);
- if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
+ AppUser appUser = appUserService.getById(userid);
+ if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
new file mode 100644
index 0000000..21402bc
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/AppUserMapper.java
@@ -0,0 +1,11 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.AppUser;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:46
+ */
+public interface AppUserMapper extends BaseMapper<AppUser> {
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/IAppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/IAppUserService.java
new file mode 100644
index 0000000..e511c9b
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/IAppUserService.java
@@ -0,0 +1,11 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.AppUser;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:46
+ */
+public interface IAppUserService extends IService<AppUser> {
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
new file mode 100644
index 0000000..eab9efd
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -0,0 +1,15 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.mapper.AppUserMapper;
+import com.ruoyi.account.service.IAppUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2024/11/21 9:46
+ */
+@Service
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
index 6b55938..b76da21 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/filter/AuthFilter.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -11,7 +11,6 @@
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -69,8 +68,8 @@
}
//小程序用户
if ("applet".equals(userType)) {
- TAppUser appUser = appUserClient.getUserById(Long.valueOf(userid)).getData();
- if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
+ AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
+ if(null == appUser || appUser.getDelFlag() == 1 || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
index e7663b5..fc27940 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ChargingOrderListInfoVO.java
@@ -1,8 +1,6 @@
package com.ruoyi.order.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -81,8 +79,4 @@
private BigDecimal sharingAmount;
@ApiModelProperty(value = "费用明细-手续费")
private BigDecimal commissionAmount;
- @ApiModelProperty(value = "充电信息")
- List<UploadRealTimeMonitoringData> list;
- @ApiModelProperty(value = "费用明细-费用列表")
- List<TChargingOrderAccountingStrategy> list1;
}
diff --git a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
index 99073cb..a8977b3 100644
--- a/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
+++ b/ruoyi-service/ruoyi-order/src/test/java/com/ruoyi/order/RuoYiOrderApplicationTests.java
@@ -1,146 +1,12 @@
package com.ruoyi.order;
-
-import com.alibaba.fastjson2.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.account.api.feignClient.*;
-import com.ruoyi.account.api.model.TAppUserCar;
-import com.ruoyi.chargingPile.api.feignClient.*;
-import com.ruoyi.chargingPile.api.model.Site;
-import com.ruoyi.chargingPile.api.model.TChargingGun;
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.integration.api.feignClient.*;
-import com.ruoyi.integration.api.model.ChargingHandshake;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.order.api.feignClient.AccountingStrategyDetailOrderClient;
-import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
-import com.ruoyi.order.api.vo.AccountingStrategyDetailOrderVo;
-import com.ruoyi.order.api.vo.ChargingOrderInfoVO;
-import com.ruoyi.order.api.vo.TransactionRecordMessageVO;
-import com.ruoyi.order.dto.ChargingDetails;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.mapper.TSettlementConfirmMapper;
-import com.ruoyi.order.service.*;
-import com.ruoyi.order.vo.EndOfChargePageInfo;
-import com.ruoyi.other.api.feignClient.IntegralRuleClient;
-import com.ruoyi.other.api.feignClient.UserTagClient;
-import com.ruoyi.other.api.feignClient.VipClient;
-import com.ruoyi.payment.api.feignClient.AliPaymentClient;
-import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
-import javax.annotation.Resource;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.*;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RuoYiOrderApplication.class)
public class RuoYiOrderApplicationTests {
- @Resource
- private TChargingOrderService chargingOrderService;
-
- @Resource
- private ChargingGunClient chargingGunClient;
- @Resource
- private TSettlementConfirmMapper tSettlementConfirmMapper;
-
- @Resource
- private SiteClient siteClient;
-
- @Resource
- private AppUserCarClient appUserCarClient;
- @Resource
- private AppUserClient appUserClient;
-
- @Resource
- private ChargingPileClient chargingPileClient;
-
- @Resource
- private TChargingOrderAccountingStrategyService chargingOrderAccountingStrategyService;
-
- @Resource
- private TokenService tokenService;
-
- @Resource
- private WxPaymentClient wxPaymentClient;
-
- @Resource
- private AliPaymentClient aliPaymentClient;
-
- @Resource
- private AppCouponClient appCouponClient;
-
- @Resource
- private AppUserVipDetailClient appUserVipDetailClient;
-
- @Resource
- private RedisService redisService;
-
- @Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
-
- @Resource
- private ChargingHandshakeClient chargingHandshakeClient;
-
- @Resource
- private SendMessageClient sendMessageClient;
-
- @Resource
- private TOrderEvaluateService orderEvaluateService;
-
- @Resource
- private AccountingStrategyDetailClient accountingStrategyDetailClient;
-
- @Resource
- private AccountingStrategyDetailOrderClient accountingStrategyDetailOrderClient;
-
- @Resource
- private AccountingStrategyClient accountingStrategyClient;
-
- @Resource
- private PlatformStartChargingReplyClient platformStartChargingReplyClient;
-
- @Resource
- private TChargingOrderRefundService chargingOrderRefundService;
-
- @Resource
- private PlatformStopChargingReplyClient platformStopChargingReplyClient;
-
- @Resource
- private AccountingStrategyOrderService accountingStrategyOrderService;
-
- @Resource
- private AccountingStrategyDetailOrderService accountingStrategyDetailOrderService;
-
- @Resource
- private InviteUserClient inviteUserClient;
-
- @Resource
- private AppUserIntegralChangeClient appUserIntegralChangeClient;
-
- @Resource
- private IntegralRuleClient integralRuleClient;
-
- @Resource
- private VipClient vipClient;
-
- @Resource
- private UserTagClient userTagClient;
-
- @Resource
- private AppUserTagClient appUserTagClient;
-
- @Resource
- private SecurityDetectionClient securityDetectionClient;
-
-
@Test
public void test(){
- MyChargingOrderInfo myChargingOrderInfo = chargingOrderService.getMyChargingOrderInfo("1852288949187297282");
}
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
index f1b9f56..baa0983 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/RuoYiOtherApplication.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.security.annotation.EnableCustomConfig;
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
-import com.ruoyi.other.webSocket.NettyServer;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -26,7 +25,6 @@
public class RuoYiOtherApplication {
public static void main(String[] args) {
SpringApplication.run(RuoYiOtherApplication.class, args);
- new NettyServer().bind();
System.out.println("(♥◠‿◠)ﾉﾞ 基础模块启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
index cc56da3..5b734ed 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/filter/AuthFilter.java
@@ -2,7 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.account.api.feignClient.AppUserClient;
-import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -11,10 +11,8 @@
import org.apache.logging.log4j.core.config.Order;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
@@ -70,8 +68,8 @@
}
//小程序用户
if ("applet".equals(userType)) {
- TAppUser appUser = appUserClient.getUserById(Long.valueOf(userid)).getData();
- if(null == appUser || appUser.getDelFlag() || 3 == appUser.getStatus()){
+ AppUser appUser = appUserClient.getAppUserById(Long.valueOf(userid));
+ if(null == appUser || 1 == appUser.getDelFlag() || 3 == appUser.getStatus()){
log.error("[账户异常处理]请求账户id:{}", userid);
unauthorizedResponse(response,"无效的账户");
return;
--
Gitblit v1.7.1