From ca412668f790f83c757656f73075d2ce37a60c4a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 11:15:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateTagService.java | 16
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java | 86 +
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java | 3
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java | 45
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserSignMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TExchangeOrderMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateTagController.java | 20
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderAccountingStrategyMapper.xml | 23
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java | 52
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 142 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 43
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceDetailServiceImpl.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java | 52
ruoyi-service/ruoyi-order/pom.xml | 9
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserCarMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceDetailController.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java | 47
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderAppealMapper.xml | 26
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserIntegralChangeServiceImpl.java | 20
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 29
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserCarServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 66 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 20
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java | 2
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserSignServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java | 84 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateTagMapper.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInviteUserController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java | 20
ruoyi-api/ruoyi-api-other/pom.xml | 6
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java | 83 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInvoiceInformationService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml | 47
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserSignController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInvoiceInformationServiceImpl.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java | 81 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceDetailMapper.java | 16
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java | 108 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderAccountingStrategyMapper.java | 16
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java | 63 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserAddressServiceImpl.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserTagServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceDetailService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java | 16
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoiceDetail.java | 64 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserSignService.java | 16
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java | 67 +
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserTagService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInviteUserMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserTagMapper.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserCarService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInviteUserService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java | 16
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java | 113 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceMapper.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserAddressService.java | 16
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml | 25
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserIntegralChangeService.java | 16
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java | 40
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java | 9
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInvoiceInformationMapper.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserAddressMapper.java | 16
.gitignore | 2
ruoyi-service/ruoyi-account/pom.xml | 12
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java | 16
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml | 33
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserIntegralChangeMapper.java | 16
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java | 71 +
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateTagMapper.xml | 17
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderAppealMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceService.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java | 20
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java | 69 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 16
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java | 20
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java | 16
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TExchangeOrderMapper.xml | 34
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java | 105 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateTagServiceImpl.java | 20
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserMapper.java | 16
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java | 20
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java | 161 ++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml | 29
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluateTag.java | 43
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceDetailMapper.xml | 22
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java | 68 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 211 ---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 20
116 files changed, 3,427 insertions(+), 213 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5304f69..c5a7652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,7 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
+generator
+.idea
target
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java
new file mode 100644
index 0000000..8fabb09
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.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 UnitListQueryDto extends BasePage {
+ String companyName;
+}
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
new file mode 100644
index 0000000..4890529
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -0,0 +1,86 @@
+package com.ruoyi.account.api.model;
+
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_coupon")
+@ApiModel(value="TAppCoupon对象", description="")
+public class TAppCoupon implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "优惠券id")
+ @TableField("coupon_id")
+ private Integer couponId;
+
+ @ApiModelProperty(value = "结束时间")
+ @TableField("end_time")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "获得方式（1=积分兑换，2=现金购买）")
+ @TableField("ways_to_obtain")
+ private Integer waysToObtain;
+
+ @ApiModelProperty(value = "兑换积分")
+ @TableField("redeem_points")
+ private Integer redeemPoints;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment_amount")
+ private BigDecimal paymentAmount;
+
+ @ApiModelProperty(value = "支付方式（1=微信，2=支付宝）")
+ @TableField("payment_type")
+ private Integer paymentType;
+
+ @ApiModelProperty(value = "第三方支付流水号")
+ @TableField("serial_number")
+ private String serialNumber;
+
+ @ApiModelProperty(value = "支付完成时间")
+ @TableField("payment_time")
+ private LocalDateTime paymentTime;
+
+ @ApiModelProperty(value = "状态（1=未使用，2=已使用）")
+ @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
new file mode 100644
index 0000000..ced7611
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java
@@ -0,0 +1,113 @@
+package com.ruoyi.account.api.model;
+
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user")
+@ApiModel(value="TAppUser对象", description="")
+public class TAppUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户")
+ @TableField("name")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "头像")
+ @TableField("avatar")
+ private String avatar;
+
+ @ApiModelProperty(value = "会员id")
+ @TableField("vip_id")
+ private Integer vipId;
+
+ @ApiModelProperty(value = "会员到期时间")
+ @TableField("vip_end_time")
+ private LocalDateTime vipEndTime;
+
+ @ApiModelProperty(value = "单位id")
+ @TableField("company_id")
+ private Integer companyId;
+
+ @ApiModelProperty(value = "身份证号")
+ @TableField("id_card")
+ private String idCard;
+
+ @ApiModelProperty(value = "认证状态（0=否，1=是）")
+ @TableField("auth_status")
+ private Integer authStatus;
+
+ @ApiModelProperty(value = "微信openid")
+ @TableField("wx_openid")
+ private String wxOpenid;
+
+ @ApiModelProperty(value = "支付宝openid")
+ @TableField("ali_openid")
+ private String aliOpenid;
+
+ @ApiModelProperty(value = "积分")
+ @TableField("points")
+ private Integer points;
+
+ @ApiModelProperty(value = "省名称")
+ @TableField("province")
+ private String province;
+
+ @ApiModelProperty(value = "省区划代码")
+ @TableField("province_code")
+ private String provinceCode;
+
+ @ApiModelProperty(value = "市名称")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty(value = "市区划代码")
+ @TableField("city_code")
+ private String cityCode;
+
+ @ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
+ @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")
+ private LocalDateTime lastLoginTime;
+
+
+}
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
new file mode 100644
index 0000000..78c9124
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java
@@ -0,0 +1,81 @@
+package com.ruoyi.account.api.model;
+
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user_address")
+@ApiModel(value="TAppUserAddress对象", description="")
+public class TAppUserAddress implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "收货人")
+ @TableField("name")
+ private String name;
+
+ @ApiModelProperty(value = "手机号码")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "市名称")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty(value = "市编号")
+ @TableField("city_code")
+ private String cityCode;
+
+ @ApiModelProperty(value = "详细地址")
+ @TableField("address")
+ private String address;
+
+ @ApiModelProperty(value = "经度")
+ @TableField("lon")
+ private String lon;
+
+ @ApiModelProperty(value = "纬度")
+ @TableField("lat")
+ private String lat;
+
+ @ApiModelProperty(value = "默认地址（0=否，1=是）")
+ @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
new file mode 100644
index 0000000..4bffc74
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java
@@ -0,0 +1,69 @@
+package com.ruoyi.account.api.model;
+
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user_car")
+@ApiModel(value="TAppUserCar对象", description="")
+public class TAppUserCar implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "app用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "车牌")
+ @TableField("license_plate")
+ private String licensePlate;
+
+ @ApiModelProperty(value = "车辆品牌")
+ @TableField("vehicle_brand")
+ private String vehicleBrand;
+
+ @ApiModelProperty(value = "车型")
+ @TableField("vehicle_model")
+ private String vehicleModel;
+
+ @ApiModelProperty(value = "车辆用途")
+ @TableField("vehicle_use")
+ private String vehicleUse;
+
+ @ApiModelProperty(value = "续航")
+ @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
new file mode 100644
index 0000000..d7e97f5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java
@@ -0,0 +1,63 @@
+package com.ruoyi.account.api.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user_integral_change")
+@ApiModel(value="TAppUserIntegralChange对象", description="")
+public class TAppUserIntegralChange implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "流水号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "变化类型（1=签到得，2=充电得，3=好评得，4=邀请好友得，5=添加车辆得，6=兑换商品减）")
+ @TableField("change_type")
+ private Integer changeType;
+
+ @ApiModelProperty(value = "历史积分")
+ @TableField("historical_integral")
+ private Integer historicalIntegral;
+
+ @ApiModelProperty(value = "当前积分")
+ @TableField("current_integral")
+ private Integer currentIntegral;
+
+ @ApiModelProperty(value = "添加时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "扩展字段")
+ @TableField("extension")
+ private String extension;
+
+
+}
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
new file mode 100644
index 0000000..9c550a5
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java
@@ -0,0 +1,52 @@
+package com.ruoyi.account.api.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user_sign")
+@ApiModel(value="TAppUserSign对象", description="")
+public class TAppUserSign implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "签到天")
+ @TableField("sign_day")
+ private LocalDate signDay;
+
+ @ApiModelProperty(value = "奖励积分")
+ @TableField("reward_points")
+ private Integer rewardPoints;
+
+ @ApiModelProperty(value = "添加时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+
+}
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
new file mode 100644
index 0000000..d4058aa
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java
@@ -0,0 +1,47 @@
+package com.ruoyi.account.api.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_app_user_tag")
+@ApiModel(value="TAppUserTag对象", description="")
+public class TAppUserTag implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "app用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "用户标签id")
+ @TableField("user_tag_id")
+ private Integer userTagId;
+
+ @ApiModelProperty(value = "添加时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+
+}
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
new file mode 100644
index 0000000..c598291
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java
@@ -0,0 +1,52 @@
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_invite_user")
+@ApiModel(value="TInviteUser对象", description="")
+public class TInviteUser implements Serializable {
+
+ 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 = "被邀请用户id")
+ @TableField("be_invited_app_user_id")
+ private Long beInvitedAppUserId;
+
+ @ApiModelProperty(value = "奖励积分")
+ @TableField("award")
+ private Integer award;
+
+ @ApiModelProperty(value = "添加时间")
+ @TableField("create_time")
+ private LocalDateTime createTime;
+
+
+}
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
new file mode 100644
index 0000000..21c014d
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
@@ -0,0 +1,84 @@
+package com.ruoyi.account.api.model;
+
+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 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 luodangjia
+ * @since 2024-08-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_invoice_information")
+@ApiModel(value="TInvoiceInformation对象", description="")
+public class TInvoiceInformation implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId("id")
+ private Long id;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
+ @TableField("invoice_type")
+ private Integer invoiceType;
+
+ @ApiModelProperty(value = "抬头类型（1=个人，2=企业）")
+ @TableField("invoicing_object_type")
+ private Integer invoicingObjectType;
+
+ @ApiModelProperty(value = "名称")
+ @TableField("name")
+ private String name;
+
+ @ApiModelProperty(value = "纳税识别号")
+ @TableField("tax_identification_number")
+ private String taxIdentificationNumber;
+
+ @ApiModelProperty(value = "公司地址")
+ @TableField("company_address")
+ private String companyAddress;
+
+ @ApiModelProperty(value = "公司电话")
+ @TableField("company_phone")
+ private String companyPhone;
+
+ @ApiModelProperty(value = "开户银行")
+ @TableField("deposit_bank")
+ private String depositBank;
+
+ @ApiModelProperty(value = "银行账户")
+ @TableField("bank_account")
+ private String bankAccount;
+
+ @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-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
index f85d8b8..e59bab3 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.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.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@
private String equipmentType;
@ApiModelProperty(value = "生产日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("production_date")
private LocalDate productionDate;
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
new file mode 100644
index 0000000..a48b136
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -0,0 +1,142 @@
+package com.ruoyi.order.api.model;
+
+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 xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_charging_order")
+@ApiModel(value="TChargingOrder对象", description="")
+public class TChargingOrder extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "订单分类（1=线上，2=线下）")
+ @TableField("order_classification")
+ private Integer orderClassification;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "充电车辆 id")
+ @TableField("app_user_car_id")
+ private Integer appUserCarId;
+
+ @ApiModelProperty(value = "停车场id")
+ @TableField("parking_lot_id")
+ private Integer parkingLotId;
+
+ @ApiModelProperty(value = "充电桩id")
+ @TableField("charging_pile_id")
+ private Integer chargingPileId;
+
+ @ApiModelProperty(value = "充电枪id")
+ @TableField("charging_gun_id")
+ private Integer chargingGunId;
+
+ @ApiModelProperty(value = "充电开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("start_time")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "充电结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("end_time")
+ private LocalDateTime endTime;
+
+ @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "充值金额")
+ @TableField("recharge_amount")
+ private BigDecimal rechargeAmount;
+
+ @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
+ @TableField("recharge_payment_type")
+ private Integer rechargePaymentType;
+
+ @ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
+ @TableField("recharge_payment_status")
+ private Integer rechargePaymentStatus;
+
+ @ApiModelProperty(value = "充值支付第三方流水号")
+ @TableField("recharge_serial_number")
+ private String rechargeSerialNumber;
+
+ @ApiModelProperty(value = "订单金额")
+ @TableField("order_amount")
+ private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "优惠券id")
+ @TableField("app_coupon_id")
+ private Long appCouponId;
+
+ @ApiModelProperty(value = "优惠金额")
+ @TableField("coupon_discount_amount")
+ private BigDecimal couponDiscountAmount;
+
+ @ApiModelProperty(value = "会员折扣")
+ @TableField("vip_discount")
+ private BigDecimal vipDiscount;
+
+ @ApiModelProperty(value = "会员优惠金额")
+ @TableField("vip_discount_amount")
+ private BigDecimal vipDiscountAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment_amount")
+ private BigDecimal paymentAmount;
+
+ @ApiModelProperty(value = "退款流水号")
+ @TableField("refund_code")
+ private String refundCode;
+
+ @ApiModelProperty(value = "退款金额")
+ @TableField("refund_amount")
+ private BigDecimal refundAmount;
+
+ @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
+ @TableField("refund_status")
+ private Integer refundStatus;
+
+ @ApiModelProperty(value = "退款第三方流水号")
+ @TableField("refund_serial_number")
+ private String refundSerialNumber;
+
+ @ApiModelProperty(value = "退款成功时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("refund_time")
+ private LocalDateTime refundTime;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
new file mode 100644
index 0000000..aeb158e
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java
@@ -0,0 +1,68 @@
+package com.ruoyi.order.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_charging_order_accounting_strategy")
+@ApiModel(value="TChargingOrderAccountingStrategy对象", description="")
+public class TChargingOrderAccountingStrategy implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "充电订单id")
+ @TableField("charging_order_id")
+ private Long chargingOrderId;
+
+ @ApiModelProperty(value = "阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）")
+ @TableField("type")
+ private Integer type;
+
+ @ApiModelProperty(value = "开始时间")
+ @TableField("start_time")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @TableField("end_time")
+ private String endTime;
+
+ @ApiModelProperty(value = "电价")
+ @TableField("electrovalence")
+ private BigDecimal electrovalence;
+
+ @ApiModelProperty(value = "服务费")
+ @TableField("service_charge")
+ private BigDecimal serviceCharge;
+
+ @ApiModelProperty(value = "原价服务费")
+ @TableField("cost_service_charge")
+ private BigDecimal costServiceCharge;
+
+ @ApiModelProperty(value = "充电度数")
+ @TableField("charging_capacity")
+ private BigDecimal chargingCapacity;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java
new file mode 100644
index 0000000..0cf63cf
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TExchangeOrder.java
@@ -0,0 +1,105 @@
+package com.ruoyi.order.api.model;
+
+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 xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_exchange_order")
+@ApiModel(value="TExchangeOrder对象", description="")
+public class TExchangeOrder extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "订单类型（1=商品，2=优惠券）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "商品id")
+ @TableField("goods_id")
+ private Integer goodsId;
+
+ @ApiModelProperty(value = "优惠券id")
+ @TableField("coupon_id")
+ private Integer couponId;
+
+ @ApiModelProperty(value = "购买数量")
+ @TableField("purchase_quantity")
+ private Integer purchaseQuantity;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ @TableField("app_user_address_id")
+ private Long appUserAddressId;
+
+ @ApiModelProperty(value = "支付积分")
+ @TableField("points")
+ private Integer points;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+
+ @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "快递公司")
+ @TableField("express_company")
+ private String expressCompany;
+
+ @ApiModelProperty(value = "快递号")
+ @TableField("express_number")
+ private String expressNumber;
+
+ @ApiModelProperty(value = "发货人id")
+ @TableField("consigner_id")
+ private Integer consignerId;
+
+ @ApiModelProperty(value = "发货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("consigner_time")
+ private LocalDateTime consignerTime;
+
+ @ApiModelProperty(value = "收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("receiving_time")
+ private LocalDateTime receivingTime;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("cancellation_time")
+ private LocalDateTime cancellationTime;
+
+ @ApiModelProperty(value = "取消人id")
+ @TableField("cancellation_id")
+ private Integer cancellationId;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java
new file mode 100644
index 0000000..0408457
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java
@@ -0,0 +1,71 @@
+package com.ruoyi.order.api.model;
+
+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 xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_order_appeal")
+@ApiModel(value="TOrderAppeal对象", description="")
+public class TOrderAppeal extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "订单id")
+ @TableField("order_id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "申诉原因")
+ @TableField("reason")
+ private String reason;
+
+ @ApiModelProperty(value = "申诉内容")
+ @TableField("content")
+ private String content;
+
+ @ApiModelProperty(value = "图片地址")
+ @TableField("img_url")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "申诉反馈")
+ @TableField("feedback")
+ private String feedback;
+
+ @ApiModelProperty(value = "反馈人id")
+ @TableField("feedback_user_id")
+ private Integer feedbackUserId;
+
+ @ApiModelProperty(value = "反馈时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("feedback_time")
+ private LocalDateTime feedbackTime;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java
new file mode 100644
index 0000000..8222276
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluate.java
@@ -0,0 +1,67 @@
+package com.ruoyi.order.api.model;
+
+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 xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_order_evaluate")
+@ApiModel(value="TOrderEvaluate对象", description="")
+public class TOrderEvaluate extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "订单id")
+ @TableField("order_id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "评分")
+ @TableField("mark")
+ private Integer mark;
+
+ @ApiModelProperty(value = "评价内容")
+ @TableField("content")
+ private String content;
+
+ @ApiModelProperty(value = "图片")
+ @TableField("img_url")
+ private String imgUrl;
+
+ @ApiModelProperty(value = "评价回复")
+ @TableField("evaluation_response")
+ private String evaluationResponse;
+
+ @ApiModelProperty(value = "回复时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("response_time")
+ private LocalDateTime responseTime;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluateTag.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluateTag.java
new file mode 100644
index 0000000..ba70982
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderEvaluateTag.java
@@ -0,0 +1,43 @@
+package com.ruoyi.order.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_order_evaluate_tag")
+@ApiModel(value="TOrderEvaluateTag对象", description="")
+public class TOrderEvaluateTag implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单评价id")
+ @TableField("order_evaluate_id")
+ private Long orderEvaluateId;
+
+ @ApiModelProperty(value = "评价标签id")
+ @TableField("evaluation_tag_id")
+ private Integer evaluationTagId;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java
new file mode 100644
index 0000000..f7f675c
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoice.java
@@ -0,0 +1,108 @@
+package com.ruoyi.order.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_order_invoice")
+@ApiModel(value="TOrderInvoice对象", description="")
+public class TOrderInvoice implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "流水号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "开票订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "开票公司")
+ @TableField("invoicing_company")
+ private String invoicingCompany;
+
+ @ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
+ @TableField("invoice_type")
+ private Integer invoiceType;
+
+ @ApiModelProperty(value = "发票材质（1=纸质发票，2=电子发票）")
+ @TableField("invoice_material")
+ private Integer invoiceMaterial;
+
+ @ApiModelProperty(value = "开票方式（1=人工，2=自动）")
+ @TableField("invoicing_method")
+ private Integer invoicingMethod;
+
+ @ApiModelProperty(value = "抬头类型（1=个人，2=企业）")
+ @TableField("invoicing_object_type")
+ private Integer invoicingObjectType;
+
+ @ApiModelProperty(value = "名称")
+ @TableField("name")
+ private String name;
+
+ @ApiModelProperty(value = "纳税识别号")
+ @TableField("tax_identification_number")
+ private String taxIdentificationNumber;
+
+ @ApiModelProperty(value = "公司地址")
+ @TableField("company_address")
+ private String companyAddress;
+
+ @ApiModelProperty(value = "公司电话")
+ @TableField("company_phone")
+ private String companyPhone;
+
+ @ApiModelProperty(value = "开户银行")
+ @TableField("deposit_bank")
+ private String depositBank;
+
+ @ApiModelProperty(value = "银行账户")
+ @TableField("bank_account")
+ private String bankAccount;
+
+ @ApiModelProperty(value = "开票总金额")
+ @TableField("total_amount")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "电子发票地址")
+ @TableField("invoice_url")
+ private String invoiceUrl;
+
+ @ApiModelProperty(value = "邮箱")
+ @TableField("mailbox")
+ private String mailbox;
+
+ @ApiModelProperty(value = "状态（1=待开票，2=开票中，3=已开票）")
+ @TableField("status")
+ private Integer status;
+
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoiceDetail.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoiceDetail.java
new file mode 100644
index 0000000..6566de9
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderInvoiceDetail.java
@@ -0,0 +1,64 @@
+package com.ruoyi.order.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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_order_invoice_detail")
+@ApiModel(value="TOrderInvoiceDetail对象", description="")
+public class TOrderInvoiceDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单开票id")
+ @TableField("order_invoice_id")
+ private Long orderInvoiceId;
+
+ @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "订单id")
+ @TableField("order_id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "开票金额")
+ @TableField("invoice_amount")
+ private BigDecimal invoiceAmount;
+
+ @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-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
new file mode 100644
index 0000000..03de2ec
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TShoppingOrder.java
@@ -0,0 +1,161 @@
+package com.ruoyi.order.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 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.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_shopping_order")
+@ApiModel(value="TShoppingOrder对象", description="")
+public class TShoppingOrder extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.NONE)
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "订单类型（1=商品，2=优惠券）")
+ @TableField("order_type")
+ private Integer orderType;
+
+ @ApiModelProperty(value = "商品id")
+ @TableField("goods_id")
+ private Integer goodsId;
+
+ @ApiModelProperty(value = "优惠券id")
+ @TableField("coupon_id")
+ private Integer couponId;
+
+ @ApiModelProperty(value = "购买数量")
+ @TableField("purchase_quantity")
+ private Integer purchaseQuantity;
+
+ @ApiModelProperty(value = "用户收货地址id")
+ @TableField("app_user_address_id")
+ private Long appUserAddressId;
+
+ @ApiModelProperty(value = "订单金额")
+ @TableField("order_amount")
+ private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "优惠券id")
+ @TableField("app_coupon_id")
+ private Long appCouponId;
+
+ @ApiModelProperty(value = "优惠金额")
+ @TableField("coupon_discount_amount")
+ private BigDecimal couponDiscountAmount;
+
+ @ApiModelProperty(value = "会员折扣")
+ @TableField("vip_discount")
+ private BigDecimal vipDiscount;
+
+ @ApiModelProperty(value = "会员优惠金额")
+ @TableField("vip_discount_amount")
+ private BigDecimal vipDiscountAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment_amount")
+ private BigDecimal paymentAmount;
+
+ @ApiModelProperty(value = "支付状态（1=待支付，2=已支付）")
+ @TableField("payment_status")
+ private Integer paymentStatus;
+
+ @ApiModelProperty(value = "支付方式（1=微信，2=支付宝）")
+ @TableField("payment_type")
+ private Integer paymentType;
+
+ @ApiModelProperty(value = "第三方支付流水号")
+ @TableField("serial_number")
+ private String serialNumber;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+
+ @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
+ @TableField("status")
+ private Integer status;
+
+ @ApiModelProperty(value = "快递公司")
+ @TableField("express_company")
+ private String expressCompany;
+
+ @ApiModelProperty(value = "快递号")
+ @TableField("express_number")
+ private String expressNumber;
+
+ @ApiModelProperty(value = "发货人id")
+ @TableField("consigner_id")
+ private Integer consignerId;
+
+ @ApiModelProperty(value = "发货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("consigner_time")
+ private LocalDateTime consignerTime;
+
+ @ApiModelProperty(value = "收货时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("receiving_time")
+ private LocalDateTime receivingTime;
+
+ @ApiModelProperty(value = "取消时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("cancellation_time")
+ private LocalDateTime cancellationTime;
+
+ @ApiModelProperty(value = "取消人id")
+ @TableField("cancellation_id")
+ private Integer cancellationId;
+
+ @ApiModelProperty(value = "退款流水号")
+ @TableField("refund_code")
+ private String refundCode;
+
+ @ApiModelProperty(value = "退款金额")
+ @TableField("refund_amount")
+ private BigDecimal refundAmount;
+
+ @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
+ @TableField("refund_status")
+ private Integer refundStatus;
+
+ @ApiModelProperty(value = "退款第三方流水号")
+ @TableField("refund_serial_number")
+ private String refundSerialNumber;
+
+ @ApiModelProperty(value = "退款成功时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("refund_time")
+ private LocalDateTime refundTime;
+
+}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
new file mode 100644
index 0000000..9e5a80c
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TVipOrder.java
@@ -0,0 +1,83 @@
+package com.ruoyi.order.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 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.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_vip_order")
+@ApiModel(value="TVipOrder对象", description="")
+public class TVipOrder extends BasePojo {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
+
+ @ApiModelProperty(value = "用户id")
+ @TableField("app_user_id")
+ private Long appUserId;
+
+ @ApiModelProperty(value = "类型（1=购买，2=赠送）")
+ @TableField("type")
+ private Integer type;
+
+ @ApiModelProperty(value = "购买的会员id")
+ @TableField("vip_id")
+ private Integer vipId;
+
+ @ApiModelProperty(value = "会员类型（1=月卡，2=季卡，3=年卡）")
+ @TableField("vip_type")
+ private Integer vipType;
+
+ @ApiModelProperty(value = "订单金额")
+ @TableField("order_amount")
+ private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+
+ @ApiModelProperty(value = "折扣金额")
+ @TableField("discount_amount")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment_amount")
+ private BigDecimal paymentAmount;
+
+ @ApiModelProperty(value = "支付状态（1=待支付，2=已支付）")
+ @TableField("payment_status")
+ private Integer paymentStatus;
+
+ @ApiModelProperty(value = "支付方式（1=微信，2=支付宝）")
+ @TableField("payment_type")
+ private Integer paymentType;
+
+ @ApiModelProperty(value = "第三方支付流水号")
+ @TableField("serial_number")
+ private String serialNumber;
+
+}
diff --git a/ruoyi-api/ruoyi-api-other/pom.xml b/ruoyi-api/ruoyi-api-other/pom.xml
index f6ac0fc..6327080 100644
--- a/ruoyi-api/ruoyi-api-other/pom.xml
+++ b/ruoyi-api/ruoyi-api-other/pom.xml
@@ -28,6 +28,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-account</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
index 1c7deb6..1fb06a2 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TCompany.java
@@ -50,6 +50,9 @@
@TableField("del_flag")
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "人数")
+ @TableField(exist = false)
+ private Long userCount;
}
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
new file mode 100644
index 0000000..75aafe1
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
@@ -0,0 +1,45 @@
+package com.ruoyi.other.api.factory;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.feignClient.GoodsClient;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 商品服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class OtherFallbackFactory implements FallbackFactory<OtherClient>
+{
+ private static final Logger log = LoggerFactory.getLogger(OtherFallbackFactory.class);
+
+ @Override
+ public OtherClient create(Throwable throwable) {
+ log.error("商品调用失败:{}", throwable.getMessage());
+ return new OtherClient() {
+
+ @Override
+ public R<Page<TCompany>> queryUnitPage(UnitListQueryDto unitListQueryDto) {
+ return R.fail("查询单位列表失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R unitAddorUpadate(TCompany tCompany) {
+ return R.fail("单位添加失败:" + throwable.getMessage());
+ }
+
+ @Override
+ public R unitDelete(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
new file mode 100644
index 0000000..741d478
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -0,0 +1,29 @@
+package com.ruoyi.other.api.feignClient;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.factory.GoodsFallbackFactory;
+import com.ruoyi.other.api.factory.OtherFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 商品服务
+ * @author ruoyi
+ */
+@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);
+}
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 a718b9f..87fbfa6 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
@@ -11,17 +11,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.management.api.feignClient.TCompanyShopClient;
-import com.ruoyi.management.api.feignClient.TCompanyShopToUserClient;
-import com.ruoyi.management.api.feignClient.TCompanyToUserClient;
-import com.ruoyi.management.api.model.AddUserShopClientDto;
-import com.ruoyi.management.api.model.TCompanyShop;
-import com.ruoyi.management.api.model.TCompanyShopToUser;
-import com.ruoyi.management.api.model.TCompanyToUser;
import com.ruoyi.system.domain.dto.IndexDto;
import com.ruoyi.system.domain.vo.UserRoleVO;
-import com.ruoyi.vehicle.api.domain.IndexVo;
-import com.ruoyi.vehicle.api.feignClient.VehicleClient;
import com.ruoyi.system.api.model.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.AddCompanyUserDto;
@@ -80,18 +71,7 @@
private ISysConfigService configService;
@Autowired
- private TCompanyShopToUserClient companyShopToUserClient;
-
- @Resource
- private TCompanyShopClient companyShopClient;
-
- @Autowired
private ISysUserRoleService userRoleService;
-
- @Autowired
- private VehicleClient vehicleClient;
- @Autowired
- private TCompanyToUserClient companyToUserClient;
@Autowired
private ISysUserRoleService sysUserRoleService;
@@ -104,67 +84,6 @@
PageInfo<SysUser> pageInfo = new PageInfo<>(pageNumber, pageSize);
PageInfo<SysUser> page = userService.getList(pageInfo, phonenumber);
return AjaxResult.success(page);
- }
-
- /**
- * 删除用户
- */
- @PostMapping("/queryManageByCompanyId")
- @ApiOperation(value = "通过公司id查询公司下的人员")
- public AjaxResult<List<UserRoleVO>> queryManageByCompanyId(@RequestParam Integer companyId,
- @RequestParam(required = false) String nickName,
- @RequestParam(required = false) String userPhone) {
-
- //根据 公司id查出中间表
- R<List<TCompanyShopToUser>> companyToUser = companyShopToUserClient.getCompanyToUser(Long.valueOf(companyId));
- List<TCompanyShopToUser> data = companyToUser.getData();
- if (data == null) {
- return AjaxResult.success(new ArrayList<>());
- }
- R<List<TCompanyToUser>> companyToUserFromCompanyId = companyShopToUserClient.getCompanyToUserFromCompanyId(Long.valueOf(companyId));
- //
- List<Integer> collect2 = data.stream().map(TCompanyShopToUser::getUserId).collect(Collectors.toList());
- if(companyToUserFromCompanyId.getData()!=null){
- List<Integer> collect = companyToUserFromCompanyId.getData().stream().map(TCompanyToUser::getUserId).collect(Collectors.toList());
- collect2.addAll(collect);
- }
- List<Integer> collect1 = collect2.stream().distinct().collect(Collectors.toList());
-
- if(collect1.size()==0){
- collect1.add(-1);
- }
-
- List<UserRoleVO> userRoleVOS = new ArrayList<>();
- // 查询该公司下的司管用户
- LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
- if(StringUtils.isNotEmpty(nickName)){
- wrapper.like(SysUser::getNickName,nickName);
- }
- if(StringUtils.isNotEmpty(userPhone)){
- wrapper.like(SysUser::getPhonenumber,userPhone);
- }
- wrapper.ne(SysUser::getRoleType,1);
- wrapper.ne(SysUser::getRoleType,2);
-
- // 查询公司绑定的用户
- List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
- .in(SysUser::getUserId, collect1));
- if(CollectionUtils.isEmpty(list)){
- return AjaxResult.success(userRoleVOS);
- }else {
- List<Long> userIds = list.stream().map(SysUser::getUserId).collect(Collectors.toList());
- wrapper.in(SysUser::getUserId,userIds);
- }
-
- List<SysUser> userList = userService.list(wrapper);
- userList.forEach(e->{
- UserRoleVO userRoleVO = new UserRoleVO();
- userRoleVO.setManageId(e.getUserId().intValue());
- userRoleVO.setManageName(e.getNickName());
- userRoleVO.setUserName(e.getUserName());
- userRoleVOS.add(userRoleVO);
- });
- return AjaxResult.success(userRoleVOS);
}
/**
@@ -272,58 +191,6 @@
}
- @GetMapping("/companyUserList")
- @ApiOperation("门店账户列表 参数 公司id")
- public AjaxResult list(Long companyId, int pageNumber, int pageSize) {
- if (companyId == null) {
- return AjaxResult.success(new ArrayList<>());
- }
- //根据 公司id查出中间表
- R<List<TCompanyShopToUser>> companyToUser = companyShopToUserClient.getCompanyToUser(companyId);
- List<TCompanyShopToUser> data = companyToUser.getData();
- if (data == null) {
- return AjaxResult.success(new ArrayList<>());
- }
- R<List<TCompanyToUser>> companyToUserFromCompanyId = companyShopToUserClient.getCompanyToUserFromCompanyId(companyId);
- //
- PageInfo<SysUser> pageInfo = new PageInfo<>(pageNumber, pageSize);
- List<Integer> collect2 = data.stream().map(TCompanyShopToUser::getUserId).collect(Collectors.toList());
- if(companyToUserFromCompanyId.getData()!=null){
- List<Integer> collect = companyToUserFromCompanyId.getData().stream().map(TCompanyToUser::getUserId).collect(Collectors.toList());
- collect2.addAll(collect);
- }
- List<Integer> collect1 = collect2.stream().distinct().collect(Collectors.toList());
-
- if(collect1.size()==0){
- collect1.add(-1);
- }
- PageInfo<SysUser> page = userService.getAllList(pageInfo,collect1 );
- ArrayList<TCompanyToUserVo> tCompanyToUserVos = new ArrayList<>();
- for (SysUser sysUser : page.getRecords()) {
- TCompanyToUserVo tCompanyToUserVo = new TCompanyToUserVo();
- tCompanyToUserVo.setId(sysUser.getUserId());
- tCompanyToUserVo.setCreateTime(sysUser.getCreateTime());
- tCompanyToUserVo.setLoginDate(sysUser.getLoginDate());
- tCompanyToUserVo.setPhonenumber(sysUser.getPhonenumber());
- tCompanyToUserVo.setStatus(sysUser.getStatus());
- tCompanyToUserVo.setUserName(sysUser.getUserName());
- SysUserRole one = userRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, sysUser.getUserId()));
- SysRole sysRole = roleService.getOne(new LambdaQueryWrapper<SysRole>().eq(SysRole::getRoleId,one.getRoleId()));
- tCompanyToUserVo.setRoleName(sysRole.getRoleName());
- // 当前用户的门店ids
- List<Integer> collect = data.stream().filter(e -> e.getUserId().toString().equals(sysUser.getUserId().toString())).map(TCompanyShopToUser::getShopId).collect(Collectors.toList());
- R<List<TCompanyShop>> listR1 = companyShopClient.queryShopByShopId(collect);
- List<String> shopNames = listR1.getData().stream().map(TCompanyShop::getShopName).collect(Collectors.toList());
- tCompanyToUserVo.setShopName(shopNames);
- tCompanyToUserVos.add(tCompanyToUserVo);
- }
- PageInfo<TCompanyToUserVo> tCompanyToUserVoPageInfo = new PageInfo<>();
- BeanUtils.copyProperties(page, tCompanyToUserVoPageInfo);
- tCompanyToUserVoPageInfo.setRecords(tCompanyToUserVos);
- return AjaxResult.success(tCompanyToUserVoPageInfo);
- }
-
-
@Log(title = "账号管理", businessType = BusinessType.INSERT)
@PostMapping("/addCompanyUser")
@ApiOperation("账号管理--添加账号")
@@ -347,12 +214,6 @@
sysUserRole.setRoleId(dto.getRoleId());
sysUserRole.setUserId(dto.getSysUser().getUserId());
userRoleService.insertSysUserRole(sysUserRole);
-
-// 添加t_company_shop_to_user
- companyShopToUserClient.addUserShop(new AddUserShopClientDto(dto.getSysUser().getUserId(), dto.getShopIds()));
- ArrayList<Integer> id = new ArrayList<>();
- id.add(dto.getCompanyId());
- companyShopToUserClient.addUserCompany(new AddUserShopClientDto(dto.getSysUser().getUserId(), id));
}
return AjaxResult.success();
}
@@ -368,9 +229,6 @@
CompanyUserVo companyUserVo = new CompanyUserVo();
companyUserVo.setRoleId(sysUserRole.getRoleId());
companyUserVo.setSysUser(sysUser);
- // 远程根据userID 获取门店id
- R<List<Integer>> shopIdsFromUserId = companyShopToUserClient.getShopIdsFromUserId(userId);
- companyUserVo.setShopIds(shopIdsFromUserId.getData());
return AjaxResult.success(companyUserVo);
}
@@ -401,9 +259,6 @@
one.setRoleId(dto.getRoleId());
//更新新的role
userRoleService.updateSysUserRole(one);
-
- // 更新t_company_shop_to_user
- companyShopToUserClient.updateUserShop(new AddUserShopClientDto(dto.getSysUser().getUserId(), dto.getShopIds()));
// }
return AjaxResult.success();
}
@@ -427,63 +282,6 @@
@Autowired
private ISysUserRoleService iSysUserRoleService;
- @GetMapping("/getAllManager")
- @ApiOperation("查询司管角色的用户")
- public AjaxResult getAllManager(@RequestParam Integer companyId,
- @RequestParam(required = false) String nickName,
- @RequestParam(required = false) String userPhone) {
- //根据 公司id查出中间表
- R<List<TCompanyShopToUser>> companyToUser = companyShopToUserClient.getCompanyToUser(companyId.longValue());
- List<TCompanyShopToUser> data = companyToUser.getData();
- if (data == null) {
- return AjaxResult.success(new ArrayList<>());
- }
- R<List<TCompanyToUser>> companyToUserFromCompanyId = companyShopToUserClient.getCompanyToUserFromCompanyId(companyId.longValue());
- //
- List<Integer> collect2 = data.stream().map(TCompanyShopToUser::getUserId).collect(Collectors.toList());
- if(companyToUserFromCompanyId.getData()!=null){
- List<Integer> collect = companyToUserFromCompanyId.getData().stream().map(TCompanyToUser::getUserId).collect(Collectors.toList());
- collect2.addAll(collect);
- }
- List<Integer> collect1 = collect2.stream().distinct().collect(Collectors.toList());
-
- if(collect1.size()==0){
- collect1.add(-1);
- }
-
- List<UserRoleVO> userRoleVOS = new ArrayList<>();
- // 查询该公司下的司管用户
- LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
- if(StringUtils.isNotEmpty(nickName)){
- wrapper.like(SysUser::getNickName,nickName);
- }
- if(StringUtils.isNotEmpty(userPhone)){
- wrapper.like(SysUser::getPhonenumber,userPhone);
- }
- wrapper.ne(SysUser::getRoleType,1);
- wrapper.ne(SysUser::getRoleType,2);
-
- // 查询公司绑定的用户
- List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
- .in(SysUser::getUserId, collect1));
- if(CollectionUtils.isEmpty(list)){
- return AjaxResult.success(userRoleVOS);
- }else {
- List<Long> userIds = list.stream().map(SysUser::getUserId).collect(Collectors.toList());
- wrapper.in(SysUser::getUserId,userIds);
- }
-
- List<SysUser> userList = userService.list(wrapper);
- userList.forEach(e->{
- UserRoleVO userRoleVO = new UserRoleVO();
- userRoleVO.setManageId(e.getUserId().intValue());
- userRoleVO.setManageName(e.getNickName());
- userRoleVO.setUserName(e.getUserName());
- userRoleVOS.add(userRoleVO);
- });
- return AjaxResult.success(userRoleVOS);
- }
-
@PostMapping("/getUserList")
@@ -491,15 +289,6 @@
List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().in(SysUser::getUserId, userIds));
return R.ok(list);
}
-
-
- @PostMapping("/index")
- @ApiOperation("工作台")
- public AjaxResult index(@RequestBody IndexDto dto) {
- R<IndexVo> index = vehicleClient.indexShopIds(dto.getShopIds());
- return AjaxResult.success(index.getData()==null?new IndexVo():index.getData());
- }
-
@PostMapping("/getSysUserFromCompanyId")
public R<List<CompanyUserListVo>> getSysUserFromCompanyId(@RequestBody CompanySysUserReq companySysUserReq) {
diff --git a/ruoyi-service/ruoyi-account/pom.xml b/ruoyi-service/ruoyi-account/pom.xml
index 250522b..5f0a89f 100644
--- a/ruoyi-service/ruoyi-account/pom.xml
+++ b/ruoyi-service/ruoyi-account/pom.xml
@@ -100,6 +100,18 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-account</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-other</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
new file mode 100644
index 0000000..8197d08
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-coupon")
+public class TAppCouponController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
new file mode 100644
index 0000000..f8422c4
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user-address")
+public class TAppUserAddressController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
new file mode 100644
index 0000000..063741b
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user-car")
+public class TAppUserCarController {
+
+}
+
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
new file mode 100644
index 0000000..b0dc360
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java
@@ -0,0 +1,66 @@
+package com.ruoyi.account.controller;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.dto.UnitListQueryDto;
+import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.service.TAppUserService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.feignClient.OtherClient;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user")
+public class TAppUserController {
+
+ @Resource
+ private OtherClient otherClient;
+ @Resource
+ private TAppUserService appUserService;
+
+ @ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
+ @PostMapping(value = "/unit/page")
+ public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+ //拿到单位列表
+ R<Page<TCompany>> pageR = otherClient.queryUnitPage(unitListQueryDto);
+ Page<TCompany> data = pageR.getData();
+ //拿到单位的用户数
+ for (TCompany record : data.getRecords()) {
+ record.setUserCount(appUserService.lambdaQuery().eq(TAppUser::getCompanyId, record.getId()).count());
+ }
+ return R.ok(data);
+ }
+
+ @ApiOperation(value = "单位管理添加或编辑", tags = {"用户管理-单位管理"})
+ @PostMapping(value = "/unit/addOrUpdate")
+ public R add(@RequestBody TCompany tCompany) {
+ //拿到单位列表
+ otherClient.unitAddorUpadate(tCompany);
+ return R.ok();
+ }
+ @ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
+ @PostMapping(value = "/unit/delete/{id}")
+ public R add(@PathVariable Integer id) {
+ otherClient.unitDelete(id);
+ return R.ok();
+
+ }
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java
new file mode 100644
index 0000000..acea96c
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user-integral-change")
+public class TAppUserIntegralChangeController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserSignController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserSignController.java
new file mode 100644
index 0000000..532d828
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserSignController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user-sign")
+public class TAppUserSignController {
+
+}
+
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
new file mode 100644
index 0000000..b8b1deb
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-app-user-tag")
+public class TAppUserTagController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInviteUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInviteUserController.java
new file mode 100644
index 0000000..a9d9cd4
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInviteUserController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-invite-user")
+public class TInviteUserController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
new file mode 100644
index 0000000..4a6346b
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@RestController
+@RequestMapping("/t-invoice-information")
+public class TInvoiceInformationController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
new file mode 100644
index 0000000..35d5a5a
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppCoupon;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppCouponMapper extends BaseMapper<TAppCoupon> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserAddressMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserAddressMapper.java
new file mode 100644
index 0000000..e6dc694
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserAddressMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUserAddress;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserAddressMapper extends BaseMapper<TAppUserAddress> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserCarMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserCarMapper.java
new file mode 100644
index 0000000..2825c84
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserCarMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUserCar;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserCarMapper extends BaseMapper<TAppUserCar> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserIntegralChangeMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserIntegralChangeMapper.java
new file mode 100644
index 0000000..12bae2e
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserIntegralChangeMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUserIntegralChange;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserIntegralChangeMapper extends BaseMapper<TAppUserIntegralChange> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserMapper.java
new file mode 100644
index 0000000..8b29689
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUser;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserMapper extends BaseMapper<TAppUser> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserSignMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserSignMapper.java
new file mode 100644
index 0000000..0183ba4
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserSignMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUserSign;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserSignMapper extends BaseMapper<TAppUserSign> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserTagMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserTagMapper.java
new file mode 100644
index 0000000..49f9342
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserTagMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TAppUserTag;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserTagMapper extends BaseMapper<TAppUserTag> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInviteUserMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInviteUserMapper.java
new file mode 100644
index 0000000..403d582
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInviteUserMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TInviteUser;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TInviteUserMapper extends BaseMapper<TInviteUser> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInvoiceInformationMapper.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInvoiceInformationMapper.java
new file mode 100644
index 0000000..ce12e2d
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInvoiceInformationMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.account.api.model.TInvoiceInformation;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TInvoiceInformationMapper extends BaseMapper<TInvoiceInformation> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
new file mode 100644
index 0000000..650c5dc
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppCoupon;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppCouponService extends IService<TAppCoupon> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserAddressService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserAddressService.java
new file mode 100644
index 0000000..1c95c4a
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserAddressService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUserAddress;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserAddressService extends IService<TAppUserAddress> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserCarService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserCarService.java
new file mode 100644
index 0000000..7106851
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserCarService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUserCar;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserCarService extends IService<TAppUserCar> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserIntegralChangeService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserIntegralChangeService.java
new file mode 100644
index 0000000..97b8c5b
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserIntegralChangeService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUserIntegralChange;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserIntegralChangeService extends IService<TAppUserIntegralChange> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java
new file mode 100644
index 0000000..600895f
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUser;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserService extends IService<TAppUser> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserSignService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserSignService.java
new file mode 100644
index 0000000..a1726f9
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserSignService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUserSign;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserSignService extends IService<TAppUserSign> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserTagService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserTagService.java
new file mode 100644
index 0000000..a132a7a
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserTagService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TAppUserTag;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TAppUserTagService extends IService<TAppUserTag> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInviteUserService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInviteUserService.java
new file mode 100644
index 0000000..6e295ed
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInviteUserService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TInviteUser;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TInviteUserService extends IService<TInviteUser> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInvoiceInformationService.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInvoiceInformationService.java
new file mode 100644
index 0000000..a03a2db
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInvoiceInformationService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.account.api.model.TInvoiceInformation;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+public interface TInvoiceInformationService extends IService<TInvoiceInformation> {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
new file mode 100644
index 0000000..cb258ba
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppCoupon;
+import com.ruoyi.account.mapper.TAppCouponMapper;
+import com.ruoyi.account.service.TAppCouponService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppCouponServiceImpl extends ServiceImpl<TAppCouponMapper, TAppCoupon> implements TAppCouponService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserAddressServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserAddressServiceImpl.java
new file mode 100644
index 0000000..d49af84
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserAddressServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUserAddress;
+import com.ruoyi.account.mapper.TAppUserAddressMapper;
+import com.ruoyi.account.service.TAppUserAddressService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserAddressServiceImpl extends ServiceImpl<TAppUserAddressMapper, TAppUserAddress> implements TAppUserAddressService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserCarServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserCarServiceImpl.java
new file mode 100644
index 0000000..0e6f034
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserCarServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUserCar;
+import com.ruoyi.account.mapper.TAppUserCarMapper;
+import com.ruoyi.account.service.TAppUserCarService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserCarServiceImpl extends ServiceImpl<TAppUserCarMapper, TAppUserCar> implements TAppUserCarService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserIntegralChangeServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserIntegralChangeServiceImpl.java
new file mode 100644
index 0000000..f334930
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserIntegralChangeServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUserIntegralChange;
+import com.ruoyi.account.mapper.TAppUserIntegralChangeMapper;
+import com.ruoyi.account.service.TAppUserIntegralChangeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserIntegralChangeServiceImpl extends ServiceImpl<TAppUserIntegralChangeMapper, TAppUserIntegralChange> implements TAppUserIntegralChangeService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
new file mode 100644
index 0000000..3e3b665
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.mapper.TAppUserMapper;
+import com.ruoyi.account.service.TAppUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserSignServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserSignServiceImpl.java
new file mode 100644
index 0000000..0e9fcfc
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserSignServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUserSign;
+import com.ruoyi.account.mapper.TAppUserSignMapper;
+import com.ruoyi.account.service.TAppUserSignService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserSignServiceImpl extends ServiceImpl<TAppUserSignMapper, TAppUserSign> implements TAppUserSignService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserTagServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserTagServiceImpl.java
new file mode 100644
index 0000000..5d06ae7
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserTagServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TAppUserTag;
+import com.ruoyi.account.mapper.TAppUserTagMapper;
+import com.ruoyi.account.service.TAppUserTagService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TAppUserTagServiceImpl extends ServiceImpl<TAppUserTagMapper, TAppUserTag> implements TAppUserTagService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java
new file mode 100644
index 0000000..e84b304
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TInviteUser;
+import com.ruoyi.account.mapper.TInviteUserMapper;
+import com.ruoyi.account.service.TInviteUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TInviteUserServiceImpl extends ServiceImpl<TInviteUserMapper, TInviteUser> implements TInviteUserService {
+
+}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInvoiceInformationServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInvoiceInformationServiceImpl.java
new file mode 100644
index 0000000..b5ff5fe
--- /dev/null
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInvoiceInformationServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.model.TInvoiceInformation;
+import com.ruoyi.account.mapper.TInvoiceInformationMapper;
+import com.ruoyi.account.service.TInvoiceInformationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-08-06
+ */
+@Service
+public class TInvoiceInformationServiceImpl extends ServiceImpl<TInvoiceInformationMapper, TInvoiceInformation> implements TInvoiceInformationService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/pom.xml b/ruoyi-service/ruoyi-order/pom.xml
index d03999d..ea57ec9 100644
--- a/ruoyi-service/ruoyi-order/pom.xml
+++ b/ruoyi-service/ruoyi-order/pom.xml
@@ -15,6 +15,15 @@
</description>
<dependencies>
+
+ <!-- ruoyi-modules-chargingPile-api -->
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-api-order</artifactId>
+ <version>3.6.2</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
new file mode 100644
index 0000000..b416452
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderAccountingStrategyController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-charging-order-accounting-strategy")
+public class TChargingOrderAccountingStrategyController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
new file mode 100644
index 0000000..c80fd1c
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-charging-order")
+public class TChargingOrderController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
new file mode 100644
index 0000000..fc7bac6
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-exchange-order")
+public class TExchangeOrderController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
new file mode 100644
index 0000000..2dee6ca
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-order-appeal")
+public class TOrderAppealController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
new file mode 100644
index 0000000..aeb652d
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-order-evaluate")
+public class TOrderEvaluateController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateTagController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateTagController.java
new file mode 100644
index 0000000..4e6fffa
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderEvaluateTagController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-order-evaluate-tag")
+public class TOrderEvaluateTagController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
new file mode 100644
index 0000000..ff4acf7
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-order-invoice")
+public class TOrderInvoiceController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceDetailController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceDetailController.java
new file mode 100644
index 0000000..0832ed5
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceDetailController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-order-invoice-detail")
+public class TOrderInvoiceDetailController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
new file mode 100644
index 0000000..e3df453
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TShoppingOrderController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-shopping-order")
+public class TShoppingOrderController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
new file mode 100644
index 0000000..b5b735e
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/t-vip-order")
+public class TVipOrderController {
+
+}
+
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderAccountingStrategyMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderAccountingStrategyMapper.java
new file mode 100644
index 0000000..84b9ff1
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderAccountingStrategyMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TChargingOrderAccountingStrategyMapper extends BaseMapper<TChargingOrderAccountingStrategy> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
new file mode 100644
index 0000000..1753120
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TChargingOrder;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TChargingOrderMapper extends BaseMapper<TChargingOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TExchangeOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TExchangeOrderMapper.java
new file mode 100644
index 0000000..c189c71
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TExchangeOrderMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TExchangeOrder;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TExchangeOrderMapper extends BaseMapper<TExchangeOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderAppealMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderAppealMapper.java
new file mode 100644
index 0000000..947cd16
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderAppealMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TOrderAppeal;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderAppealMapper extends BaseMapper<TOrderAppeal> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateMapper.java
new file mode 100644
index 0000000..82987cb
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TOrderEvaluate;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderEvaluateMapper extends BaseMapper<TOrderEvaluate> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateTagMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateTagMapper.java
new file mode 100644
index 0000000..439c2c9
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderEvaluateTagMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TOrderEvaluateTag;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderEvaluateTagMapper extends BaseMapper<TOrderEvaluateTag> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceDetailMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceDetailMapper.java
new file mode 100644
index 0000000..7a410e8
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceDetailMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TOrderInvoiceDetail;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderInvoiceDetailMapper extends BaseMapper<TOrderInvoiceDetail> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceMapper.java
new file mode 100644
index 0000000..85ce841
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TOrderInvoiceMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TOrderInvoice;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderInvoiceMapper extends BaseMapper<TOrderInvoice> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java
new file mode 100644
index 0000000..e149bc3
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TShoppingOrderMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TShoppingOrder;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TShoppingOrderMapper extends BaseMapper<TShoppingOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java
new file mode 100644
index 0000000..a6405ab
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TVipOrderMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.order.api.model.TVipOrder;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TVipOrderMapper extends BaseMapper<TVipOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java
new file mode 100644
index 0000000..815962b
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TChargingOrderAccountingStrategyService extends IService<TChargingOrderAccountingStrategy> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
new file mode 100644
index 0000000..5650b83
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TChargingOrder;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TChargingOrderService extends IService<TChargingOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java
new file mode 100644
index 0000000..9246415
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TExchangeOrder;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TExchangeOrderService extends IService<TExchangeOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java
new file mode 100644
index 0000000..56e086f
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TOrderAppeal;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderAppealService extends IService<TOrderAppeal> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java
new file mode 100644
index 0000000..0acd943
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TOrderEvaluate;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderEvaluateService extends IService<TOrderEvaluate> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateTagService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateTagService.java
new file mode 100644
index 0000000..4610adc
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateTagService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TOrderEvaluateTag;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderEvaluateTagService extends IService<TOrderEvaluateTag> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceDetailService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceDetailService.java
new file mode 100644
index 0000000..08097cc
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceDetailService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TOrderInvoiceDetail;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderInvoiceDetailService extends IService<TOrderInvoiceDetail> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceService.java
new file mode 100644
index 0000000..ee4cbb5
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TOrderInvoice;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TOrderInvoiceService extends IService<TOrderInvoice> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
new file mode 100644
index 0000000..2487ffd
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TShoppingOrder;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TShoppingOrderService extends IService<TShoppingOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java
new file mode 100644
index 0000000..c78fb3e
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.order.api.model.TVipOrder;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+public interface TVipOrderService extends IService<TVipOrder> {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
new file mode 100644
index 0000000..6c41242
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+import com.ruoyi.order.mapper.TChargingOrderAccountingStrategyMapper;
+import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TChargingOrderAccountingStrategyServiceImpl extends ServiceImpl<TChargingOrderAccountingStrategyMapper, TChargingOrderAccountingStrategy> implements TChargingOrderAccountingStrategyService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
new file mode 100644
index 0000000..de40f2c
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TChargingOrder;
+import com.ruoyi.order.mapper.TChargingOrderMapper;
+import com.ruoyi.order.service.TChargingOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TChargingOrderServiceImpl extends ServiceImpl<TChargingOrderMapper, TChargingOrder> implements TChargingOrderService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
new file mode 100644
index 0000000..84f4764
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TExchangeOrder;
+import com.ruoyi.order.mapper.TExchangeOrderMapper;
+import com.ruoyi.order.service.TExchangeOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TExchangeOrderServiceImpl extends ServiceImpl<TExchangeOrderMapper, TExchangeOrder> implements TExchangeOrderService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
new file mode 100644
index 0000000..93b5c54
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TOrderAppeal;
+import com.ruoyi.order.mapper.TOrderAppealMapper;
+import com.ruoyi.order.service.TOrderAppealService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TOrderAppealServiceImpl extends ServiceImpl<TOrderAppealMapper, TOrderAppeal> implements TOrderAppealService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
new file mode 100644
index 0000000..c636186
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TOrderEvaluate;
+import com.ruoyi.order.mapper.TOrderEvaluateMapper;
+import com.ruoyi.order.service.TOrderEvaluateService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TOrderEvaluateServiceImpl extends ServiceImpl<TOrderEvaluateMapper, TOrderEvaluate> implements TOrderEvaluateService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateTagServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateTagServiceImpl.java
new file mode 100644
index 0000000..b9a30e8
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateTagServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TOrderEvaluateTag;
+import com.ruoyi.order.mapper.TOrderEvaluateTagMapper;
+import com.ruoyi.order.service.TOrderEvaluateTagService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TOrderEvaluateTagServiceImpl extends ServiceImpl<TOrderEvaluateTagMapper, TOrderEvaluateTag> implements TOrderEvaluateTagService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceDetailServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceDetailServiceImpl.java
new file mode 100644
index 0000000..7d8d469
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceDetailServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TOrderInvoiceDetail;
+import com.ruoyi.order.mapper.TOrderInvoiceDetailMapper;
+import com.ruoyi.order.service.TOrderInvoiceDetailService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TOrderInvoiceDetailServiceImpl extends ServiceImpl<TOrderInvoiceDetailMapper, TOrderInvoiceDetail> implements TOrderInvoiceDetailService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
new file mode 100644
index 0000000..2440069
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TOrderInvoice;
+import com.ruoyi.order.mapper.TOrderInvoiceMapper;
+import com.ruoyi.order.service.TOrderInvoiceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TOrderInvoiceServiceImpl extends ServiceImpl<TOrderInvoiceMapper, TOrderInvoice> implements TOrderInvoiceService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
new file mode 100644
index 0000000..b30e82f
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.mapper.TShoppingOrderMapper;
+import com.ruoyi.order.service.TShoppingOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TShoppingOrderServiceImpl extends ServiceImpl<TShoppingOrderMapper, TShoppingOrder> implements TShoppingOrderService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
new file mode 100644
index 0000000..1564d74
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.order.api.model.TVipOrder;
+import com.ruoyi.order.mapper.TVipOrderMapper;
+import com.ruoyi.order.service.TVipOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2024-08-07
+ */
+@Service
+public class TVipOrderServiceImpl extends ServiceImpl<TVipOrderMapper, TVipOrder> implements TVipOrderService {
+
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderAccountingStrategyMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderAccountingStrategyMapper.xml
new file mode 100644
index 0000000..96cb855
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderAccountingStrategyMapper.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.order.mapper.TChargingOrderAccountingStrategyMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TChargingOrderAccountingStrategy">
+ <id column="id" property="id" />
+ <result column="charging_order_id" property="chargingOrderId" />
+ <result column="`type`" property="type" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="electrovalence" property="electrovalence" />
+ <result column="service_charge" property="serviceCharge" />
+ <result column="cost_service_charge" property="costServiceCharge" />
+ <result column="charging_capacity" property="chargingCapacity" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, charging_order_id, `type`, start_time, end_time, electrovalence, service_charge, cost_service_charge, charging_capacity
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
new file mode 100644
index 0000000..5d95538
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -0,0 +1,43 @@
+<?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.order.mapper.TChargingOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TChargingOrder">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="order_type" property="orderType" />
+ <result column="order_classification" property="orderClassification" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="app_user_car_id" property="appUserCarId" />
+ <result column="parking_lot_id" property="parkingLotId" />
+ <result column="charging_pile_id" property="chargingPileId" />
+ <result column="charging_gun_id" property="chargingGunId" />
+ <result column="start_time" property="startTime" />
+ <result column="end_time" property="endTime" />
+ <result column="status" property="status" />
+ <result column="recharge_amount" property="rechargeAmount" />
+ <result column="recharge_payment_type" property="rechargePaymentType" />
+ <result column="recharge_payment_status" property="rechargePaymentStatus" />
+ <result column="recharge_serial_number" property="rechargeSerialNumber" />
+ <result column="order_amount" property="orderAmount" />
+ <result column="app_coupon_id" property="appCouponId" />
+ <result column="coupon_discount_amount" property="couponDiscountAmount" />
+ <result column="vip_discount" property="vipDiscount" />
+ <result column="vip_discount_amount" property="vipDiscountAmount" />
+ <result column="payment_amount" property="paymentAmount" />
+ <result column="refund_code" property="refundCode" />
+ <result column="refund_amount" property="refundAmount" />
+ <result column="refund_status" property="refundStatus" />
+ <result column="refund_serial_number" property="refundSerialNumber" />
+ <result column="refund_time" property="refundTime" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, order_type, order_classification, app_user_id, app_user_car_id, parking_lot_id, charging_pile_id, charging_gun_id, start_time, end_time, status, recharge_amount, recharge_payment_type, recharge_payment_status, recharge_serial_number, order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount, refund_code, refund_amount, refund_status, refund_serial_number, refund_time, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TExchangeOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TExchangeOrderMapper.xml
new file mode 100644
index 0000000..a13a0ce
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TExchangeOrderMapper.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.order.mapper.TExchangeOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TExchangeOrder">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="order_type" property="orderType" />
+ <result column="goods_id" property="goodsId" />
+ <result column="coupon_id" property="couponId" />
+ <result column="purchase_quantity" property="purchaseQuantity" />
+ <result column="app_user_address_id" property="appUserAddressId" />
+ <result column="points" property="points" />
+ <result column="remark" property="remark" />
+ <result column="status" property="status" />
+ <result column="express_company" property="expressCompany" />
+ <result column="express_number" property="expressNumber" />
+ <result column="consigner_id" property="consignerId" />
+ <result column="consigner_time" property="consignerTime" />
+ <result column="receiving_time" property="receivingTime" />
+ <result column="cancellation_time" property="cancellationTime" />
+ <result column="cancellation_id" property="cancellationId" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, app_user_id, order_type, goods_id, coupon_id, purchase_quantity, app_user_address_id, points, remark, status, express_company, express_number, consigner_id, consigner_time, receiving_time, cancellation_time, cancellation_id, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderAppealMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderAppealMapper.xml
new file mode 100644
index 0000000..755242b
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderAppealMapper.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.order.mapper.TOrderAppealMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderAppeal">
+ <id column="id" property="id" />
+ <result column="order_type" property="orderType" />
+ <result column="order_id" property="orderId" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="reason" property="reason" />
+ <result column="content" property="content" />
+ <result column="img_url" property="imgUrl" />
+ <result column="feedback" property="feedback" />
+ <result column="feedback_user_id" property="feedbackUserId" />
+ <result column="feedback_time" property="feedbackTime" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, order_type, order_id, app_user_id, reason, content, img_url, feedback, feedback_user_id, feedback_time, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
new file mode 100644
index 0000000..8b88832
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateMapper.xml
@@ -0,0 +1,25 @@
+<?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.order.mapper.TOrderEvaluateMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderEvaluate">
+ <id column="id" property="id" />
+ <result column="order_type" property="orderType" />
+ <result column="order_id" property="orderId" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="mark" property="mark" />
+ <result column="content" property="content" />
+ <result column="img_url" property="imgUrl" />
+ <result column="evaluation_response" property="evaluationResponse" />
+ <result column="create_time" property="createTime" />
+ <result column="response_time" property="responseTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, order_type, order_id, app_user_id, mark, content, img_url, evaluation_response, create_time, response_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateTagMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateTagMapper.xml
new file mode 100644
index 0000000..d48e938
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderEvaluateTagMapper.xml
@@ -0,0 +1,17 @@
+<?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.order.mapper.TOrderEvaluateTagMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderEvaluateTag">
+ <id column="id" property="id" />
+ <result column="order_evaluate_id" property="orderEvaluateId" />
+ <result column="evaluation_tag_id" property="evaluationTagId" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, order_evaluate_id, evaluation_tag_id
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceDetailMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceDetailMapper.xml
new file mode 100644
index 0000000..b668acb
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceDetailMapper.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.order.mapper.TOrderInvoiceDetailMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderInvoiceDetail">
+ <id column="id" property="id" />
+ <result column="order_invoice_id" property="orderInvoiceId" />
+ <result column="order_type" property="orderType" />
+ <result column="order_id" property="orderId" />
+ <result column="invoice_amount" property="invoiceAmount" />
+ <result column="electricity_tariff" property="electricityTariff" />
+ <result column="service_tariff" property="serviceTariff" />
+ <result column="added_service_tariff" property="addedServiceTariff" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, order_invoice_id, order_type, order_id, invoice_amount, electricity_tariff, service_tariff, added_service_tariff
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml
new file mode 100644
index 0000000..b5c6c33
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml
@@ -0,0 +1,33 @@
+<?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.order.mapper.TOrderInvoiceMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderInvoice">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="order_type" property="orderType" />
+ <result column="invoicing_company" property="invoicingCompany" />
+ <result column="invoice_type" property="invoiceType" />
+ <result column="invoice_material" property="invoiceMaterial" />
+ <result column="invoicing_method" property="invoicingMethod" />
+ <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="total_amount" property="totalAmount" />
+ <result column="invoice_url" property="invoiceUrl" />
+ <result column="mailbox" property="mailbox" />
+ <result column="status" property="status" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, app_user_id, order_type, invoicing_company, invoice_type, invoice_material, invoicing_method, invoicing_object_type, name, tax_identification_number, company_address, company_phone, deposit_bank, bank_account, total_amount, invoice_url, mailbox, status
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
new file mode 100644
index 0000000..9a6103f
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml
@@ -0,0 +1,47 @@
+<?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.order.mapper.TShoppingOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TShoppingOrder">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="order_type" property="orderType" />
+ <result column="goods_id" property="goodsId" />
+ <result column="coupon_id" property="couponId" />
+ <result column="purchase_quantity" property="purchaseQuantity" />
+ <result column="app_user_address_id" property="appUserAddressId" />
+ <result column="order_amount" property="orderAmount" />
+ <result column="app_coupon_id" property="appCouponId" />
+ <result column="coupon_discount_amount" property="couponDiscountAmount" />
+ <result column="vip_discount" property="vipDiscount" />
+ <result column="vip_discount_amount" property="vipDiscountAmount" />
+ <result column="payment_amount" property="paymentAmount" />
+ <result column="payment_status" property="paymentStatus" />
+ <result column="payment_type" property="paymentType" />
+ <result column="serial_number" property="serialNumber" />
+ <result column="remark" property="remark" />
+ <result column="status" property="status" />
+ <result column="express_company" property="expressCompany" />
+ <result column="express_number" property="expressNumber" />
+ <result column="consigner_id" property="consignerId" />
+ <result column="consigner_time" property="consignerTime" />
+ <result column="receiving_time" property="receivingTime" />
+ <result column="cancellation_time" property="cancellationTime" />
+ <result column="cancellation_id" property="cancellationId" />
+ <result column="refund_code" property="refundCode" />
+ <result column="refund_amount" property="refundAmount" />
+ <result column="refund_status" property="refundStatus" />
+ <result column="refund_serial_number" property="refundSerialNumber" />
+ <result column="refund_time" property="refundTime" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, app_user_id, order_type, goods_id, coupon_id, purchase_quantity, app_user_address_id, order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount, payment_status, payment_type, serial_number, remark, status, express_company, express_number, consigner_id, consigner_time, receiving_time, cancellation_time, cancellation_id, refund_code, refund_amount, refund_status, refund_serial_number, refund_time, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml
new file mode 100644
index 0000000..b5ab870
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TVipOrderMapper.xml
@@ -0,0 +1,29 @@
+<?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.order.mapper.TVipOrderMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TVipOrder">
+ <id column="id" property="id" />
+ <result column="code" property="code" />
+ <result column="app_user_id" property="appUserId" />
+ <result column="type" property="type" />
+ <result column="vip_id" property="vipId" />
+ <result column="vip_type" property="vipType" />
+ <result column="order_amount" property="orderAmount" />
+ <result column="discount" property="discount" />
+ <result column="discount_amount" property="discountAmount" />
+ <result column="payment_amount" property="paymentAmount" />
+ <result column="payment_status" property="paymentStatus" />
+ <result column="payment_type" property="paymentType" />
+ <result column="serial_number" property="serialNumber" />
+ <result column="create_time" property="createTime" />
+ <result column="del_flag" property="delFlag" />
+ </resultMap>
+
+ <!-- 通用查询结果列 -->
+ <sql id="Base_Column_List">
+ id, code, app_user_id, `type`, vip_id, vip_type, order_amount, discount, discount_amount, payment_amount, payment_status, payment_type, serial_number, create_time, del_flag
+ </sql>
+
+</mapper>
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
index 65707f8..83a51af 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCompanyController.java
@@ -1,9 +1,16 @@
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.UnitListQueryDto;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.service.TCompanyService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -16,6 +23,35 @@
@RestController
@RequestMapping("/t-company")
public class TCompanyController {
+ @Resource
+ private TCompanyService companyService;
+
+ //单位分页
+ @PostMapping(value = "/unit/page")
+ public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
+ Page<TCompany> page = companyService.lambdaQuery()
+ .orderByDesc(TCompany::getCreateTime)
+ .like(unitListQueryDto.getCompanyName()!=null&& unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
+ .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
+ return R.ok(page);
+
+ }
+ //单位添加
+ @PostMapping(value = "/unit/addOrUpdate")
+ public R add(@RequestBody TCompany tCompany) {
+ if (tCompany.getId()==null){
+ tCompany.setCreateTime(LocalDateTime.now());
+ }
+ companyService.saveOrUpdate(tCompany);
+ return R.ok();
+ }
+
+ @PostMapping(value = "/unit/delete")
+ public R add(@RequestParam Integer id) {
+ companyService.removeById(id);
+
+ return R.ok();
+ }
}
--
Gitblit v1.7.1