From 980d0d6571f4b50b51502ee60094a3dbdf1fb2f7 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 07 八月 2024 16:40:21 +0800
Subject: [PATCH] 8.7.1
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java | 10 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 1
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserMapper.xml | 34 ++++
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserSignMapper.xml | 19 ++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 18 ++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java | 10 -
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java | 17 ++
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java | 6
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserTagMapper.xml | 18 ++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java | 10 -
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserCarMapper.xml | 23 ++
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInviteUserMapper.xml | 19 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 17 ++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 53 ++++++
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppCouponMapper.xml | 27 +++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java | 3
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml | 27 +++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java | 16 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 10 -
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java | 1
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java | 39 ++++
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml | 22 ++
ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml | 26 +++
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java | 3
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java | 9 +
25 files changed, 387 insertions(+), 51 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java
new file mode 100644
index 0000000..0b010af
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/TagListQueryDto.java
@@ -0,0 +1,9 @@
+package com.ruoyi.account.api.dto;
+
+import com.ruoyi.common.core.web.page.BasePage;
+import lombok.Data;
+
+@Data
+public class TagListQueryDto extends BasePage {
+ String tagName;
+}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
index 4890529..882c0a5 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_coupon")
@ApiModel(value="TAppCoupon对象", description="")
-public class TAppCoupon implements Serializable {
+public class TAppCoupon extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -73,14 +74,7 @@
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
index ced7611..0bfa1c3 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user")
@ApiModel(value="TAppUser对象", description="")
-public class TAppUser implements Serializable {
+public class TAppUser extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -96,14 +97,7 @@
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
@ApiModelProperty(value = "最后一次登录时间")
@TableField("last_login_time")
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java
index 78c9124..da2021c 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_address")
@ApiModel(value="TAppUserAddress对象", description="")
-public class TAppUserAddress implements Serializable {
+public class TAppUserAddress extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -68,14 +69,7 @@
@TableField("default_address")
private Integer defaultAddress;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
index 4bffc74..653e792 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_car")
@ApiModel(value="TAppUserCar对象", description="")
-public class TAppUserCar implements Serializable {
+public class TAppUserCar extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -56,14 +57,7 @@
@TableField("endurance")
private String endurance;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
index d7e97f5..60f0015 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
index 9c550a5..a3e77c3 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_sign")
@ApiModel(value="TAppUserSign对象", description="")
-public class TAppUserSign implements Serializable {
+public class TAppUserSign extends BasePojo {
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java
index d4058aa..daa3daa 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_tag")
@ApiModel(value="TAppUserTag对象", description="")
-public class TAppUserTag implements Serializable {
+public class TAppUserTag implements Serializable{
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java
index c598291..9a62b6f 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
index 21c014d..c3d62b5 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice_information")
@ApiModel(value="TInvoiceInformation对象", description="")
-public class TInvoiceInformation implements Serializable {
+public class TInvoiceInformation extends BasePojo {
private static final long serialVersionUID = 1L;
@@ -67,18 +68,11 @@
@TableField("bank_account")
private String bankAccount;
- @ApiModelProperty(value = "设置默认（0=否，1=是）")
- @TableField("default")
- private Integer default;
+// @ApiModelProperty(value = "设置默认（0=否，1=是）")
+// @TableField("default")
+// private Integer default;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
}
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppCouponMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppCouponMapper.xml
new file mode 100644
index 0000000..002b4a4
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppCouponMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppCouponMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppCoupon">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="coupon_id" property="couponId" />
+ <result column="end_time" property="endTime" />
+ <result column="ways_to_obtain" property="waysToObtain" />
+ <result column="redeem_points" property="redeemPoints" />
+ <result column="payment_amount" property="paymentAmount" />
+ <result column="payment_type" property="paymentType" />
+ <result column="serial_number" property="serialNumber" />
+ <result column="payment_time" property="paymentTime" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, coupon_id, end_time, ways_to_obtain, redeem_points, payment_amount, payment_type, serial_number, payment_time, status, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml
new file mode 100644
index 0000000..d827753
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserAddressMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserAddress">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="name" property="name" />
+ <result column="phone" property="phone" />
+ <result column="city" property="city" />
+ <result column="city_code" property="cityCode" />
+ <result column="address" property="address" />
+ <result column="lon" property="lon" />
+ <result column="lat" property="lat" />
+ <result column="default_address" property="defaultAddress" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, name, phone, city, city_code, address, lon, lat, default_address, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserCarMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserCarMapper.xml
new file mode 100644
index 0000000..bfc95ec
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserCarMapper.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserCarMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserCar">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="license_plate" property="licensePlate" />
+ <result column="vehicle_brand" property="vehicleBrand" />
+ <result column="vehicle_model" property="vehicleModel" />
+ <result column="vehicle_use" property="vehicleUse" />
+ <result column="endurance" property="endurance" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, license_plate, vehicle_brand, vehicle_model, vehicle_use, endurance, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml
new file mode 100644
index 0000000..b5c42c7
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserIntegralChangeMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserIntegralChangeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserIntegralChange">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="change_type" property="changeType" />
+ <result column="historical_integral" property="historicalIntegral" />
+ <result column="current_integral" property="currentIntegral" />
+ <result column="create_time" property="createTime" />
+ <result column="extension" property="extension" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, app_user_id, change_type, historical_integral, current_integral, create_time, extension
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserMapper.xml
new file mode 100644
index 0000000..747077e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUser">
+ <id column="id" property="id" />
+ <result column="name" property="name" />
+ <result column="phone" property="phone" />
+ <result column="avatar" property="avatar" />
+ <result column="vip_id" property="vipId" />
+ <result column="vip_end_time" property="vipEndTime" />
+ <result column="company_id" property="companyId" />
+ <result column="id_card" property="idCard" />
+ <result column="auth_status" property="authStatus" />
+ <result column="wx_openid" property="wxOpenid" />
+ <result column="ali_openid" property="aliOpenid" />
+ <result column="points" property="points" />
+ <result column="province" property="province" />
+ <result column="province_code" property="provinceCode" />
+ <result column="city" property="city" />
+ <result column="city_code" property="cityCode" />
+ <result column="status" property="status" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ <result column="last_login_time" property="lastLoginTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, name, phone, avatar, vip_id, vip_end_time, company_id, id_card, auth_status, wx_openid, ali_openid, points, province, province_code, city, city_code, status, create_time, del_flag, last_login_time
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserSignMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserSignMapper.xml
new file mode 100644
index 0000000..d0cb7d0
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserSignMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserSignMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserSign">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="sign_day" property="signDay" />
+ <result column="reward_points" property="rewardPoints" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, sign_day, reward_points, create_time
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserTagMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserTagMapper.xml
new file mode 100644
index 0000000..c6c4943
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TAppUserTagMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TAppUserTagMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TAppUserTag">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="user_tag_id" property="userTagId" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, user_tag_id, create_time
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInviteUserMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInviteUserMapper.xml
new file mode 100644
index 0000000..bed9a01
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInviteUserMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TInviteUserMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TInviteUser">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="be_invited_app_user_id" property="beInvitedAppUserId" />
+ <result column="award" property="award" />
+ <result column="create_time" property="createTime" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, be_invited_app_user_id, award, create_time
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml
new file mode 100644
index 0000000..4cbf9cf
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/resources/mapper/account/TInvoiceInformationMapper.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.account.api.mapper.TInvoiceInformationMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.account.api.model.TInvoiceInformation">
+ <id column="id" property="id" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="invoice_type" property="invoiceType" />
+ <result column="invoicing_object_type" property="invoicingObjectType" />
+ <result column="name" property="name" />
+ <result column="tax_identification_number" property="taxIdentificationNumber" />
+ <result column="company_address" property="companyAddress" />
+ <result column="company_phone" property="companyPhone" />
+ <result column="deposit_bank" property="depositBank" />
+ <result column="bank_account" property="bankAccount" />
+ <result column="default" property="default" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, app_user_id, invoice_type, invoicing_object_type, name, tax_identification_number, company_address, company_phone, deposit_bank, bank_account, default, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
index 99b4ad4..0126a47 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java
@@ -51,4 +51,10 @@
private Integer delFlag;
+ @ApiModelProperty(value = "到达人数")
+ @TableField(exist = false)
+ private Long count;
+
+
+
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
index 75aafe1..2466d95 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
@@ -1,9 +1,11 @@
package com.ruoyi.other.api.factory;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.TagListQueryDto;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.OtherClient;
import org.slf4j.Logger;
@@ -40,6 +42,21 @@
public R unitDelete(Integer id) {
return R.fail("删除单位失败:" + throwable.getMessage());
}
+
+ @Override
+ public R<Page<TUserTag>> queryTagPage(TagListQueryDto unitListQueryDto) {
+ return R.fail("查询标签:" + throwable.getMessage());
+ }
+
+ @Override
+ public R addorUpdateTag(TUserTag tUserTag) {
+ return R.fail("添加标签:" + throwable.getMessage());
+ }
+
+ @Override
+ public R deleteTag(Integer id) {
+ return R.fail("查询标签:" + throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index 741d478..4630bf6 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -1,10 +1,12 @@
package com.ruoyi.other.api.feignClient;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.TagListQueryDto;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
import com.ruoyi.other.api.factory.GoodsFallbackFactory;
import com.ruoyi.other.api.factory.OtherFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
@@ -18,12 +20,24 @@
*/
@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = OtherFallbackFactory.class)
public interface OtherClient {
-
+ //单位分页
@PostMapping(value = "/t-company/unit/page")
R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
-
+ //单位添加修改
@PostMapping(value = "/t-company/unit/addOrUpdate")
R unitAddorUpadate(@RequestBody TCompany tCompany);
+ //单位删除
@PostMapping(value = "/t-company/unit/delete")
R unitDelete(@RequestParam Integer id);
+
+
+ //标签分页
+ @PostMapping(value = "/t-user-tag/page")
+ R<Page<TUserTag>> queryTagPage(@RequestBody TagListQueryDto unitListQueryDto);
+
+ //用户新增标签
+ @PostMapping(value = "/t-user-tag/addorUpdateTag")
+ R addorUpdateTag(@RequestBody TUserTag tUserTag);
+ @PostMapping(value = "/t-user-tag/delete")
+ R deleteTag(@RequestParam Integer id);
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
index b0dc360..c261e65 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -62,5 +62,22 @@
}
+
+ @ApiOperation(value = "用户列表", tags = {"用户管理-用户管理"})
+ @PostMapping(value = "/user/page")
+ public R<Page<TCompany>> userPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+
+ //拿到标签tag
+
+ //拿到会员map
+
+ //列表查询
+
+
+
+
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index b8b1deb..7609389 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -1,8 +1,20 @@
package com.ruoyi.account.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.TagListQueryDto;
+import com.ruoyi.account.api.dto.UnitListQueryDto;
+import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserTag;
+import com.ruoyi.account.service.TAppUserTagService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -15,6 +27,43 @@
@RestController
@RequestMapping("/t-app-user-tag")
public class TAppUserTagController {
+ @Resource
+ private OtherClient otherClient;
+ @Resource
+ private TAppUserTagService appUserTagService;
+
+ @ApiOperation(value = "标签管理列表", tags = {"用户管理-用户标签管理"})
+ @PostMapping(value = "/tags/page")
+ public R<Page<TUserTag>> tagPage(@RequestBody TagListQueryDto tagListQueryDto) {
+ //拿到单位列表
+ R<Page<TUserTag>> pageR = otherClient.queryTagPage(tagListQueryDto);
+ Page<TUserTag> data = pageR.getData();
+ //拿到单位的用户数
+ for (TUserTag record : data.getRecords()) {
+ record.setCount(appUserTagService.lambdaQuery().eq(TAppUserTag::getUserTagId, record.getId()).count());
+ }
+ return R.ok(data);
+ }
+
+
+ @ApiOperation(value = "标签添加或修改", tags = {"用户管理-用户标签管理"})
+ @PostMapping(value = "/tags/add")
+ public R<Page<TUserTag>> tagAdd(@RequestBody TUserTag tUserTag) {
+ //拿到单位列表
+ otherClient.addorUpdateTag(tUserTag);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "标签删除", tags = {"用户管理-用户标签管理"})
+ @PostMapping(value = "/tags/delete/{id}")
+ public R delete(@PathVariable Integer id) {
+ //拿到单位列表
+ otherClient.deleteTag(id);
+ return R.ok();
+ }
+
+
+
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
index 2871d37..1ce47ac 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.TagListQueryDto;
+import com.ruoyi.account.api.dto.UnitListQueryDto;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.mapper.TUserTagMapper;
+import com.ruoyi.other.service.TUserTagService;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -16,6 +25,32 @@
@RestController
@RequestMapping("/t-user-tag")
public class TUserTagController {
+ @Resource
+ private TUserTagService tUserTagService;
+
+ @PostMapping(value = "/page")
+ public R<Page<TUserTag>> page(@RequestBody TagListQueryDto tagListQueryDto) {
+ Page<TUserTag> page = tUserTagService.lambdaQuery()
+ .orderByDesc(TUserTag::getCreateTime)
+ .like(tagListQueryDto.getTagName()!=null&& tagListQueryDto.getTagName().isEmpty(), TUserTag::getName, tagListQueryDto.getTagName())
+ .page(Page.of(tagListQueryDto.getPageCurr(), tagListQueryDto.getPageSize()));
+ return R.ok(page);
+
+ }
+
+ @PostMapping(value = "/addorUpdateTag")
+ public R addorUpdateTag(@RequestBody TUserTag tUserTag) {
+ tUserTag.setCreateTime(LocalDateTime.now());
+ tUserTagService.saveOrUpdate(tUserTag);
+ return R.ok();
+ }
+
+ @PostMapping(value = "/delete")
+ public R delete(@RequestParam Integer id) {
+ tUserTagService.removeById(id);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1