From 824c68e08b9f83ce79ff3b791a7ca6c6a231b668 Mon Sep 17 00:00:00 2001 From: fxh <1763817137@qq.com> Date: Thu, 24 Jul 2025 10:22:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=A0=E7=A7=9F=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/domain/SysTenant.java | 2 +- .../system/domain/bo/SysTenantExtendBo.java | 2 +- .../dromara/system/domain/dto/TenantDTO.java | 5 ++++- .../dromara/system/domain/vo/SysTenantVo.java | 22 +++++-------------- .../service/impl/SysTenantServiceImpl.java | 2 +- .../transaction/wechat/WechatPayConfig.java | 2 +- 6 files changed, 13 insertions(+), 22 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java index 140fdf92e..50c587fe8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java @@ -88,7 +88,7 @@ public class SysTenant extends BaseEntity { private String companyType; @Schema(description = "经营类型") - private String businessTypes; + private List businessTypes; @Schema(description = "相关资质名称及附件") private String relatedimg; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java index e1e20a261..db77f0201 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantExtendBo.java @@ -68,7 +68,7 @@ public class SysTenantExtendBo { private String companyType; @Schema(description = "经营类型") - private String businessTypes; + private List businessTypes; @Schema(description = "相关资质名称及附件") private String relatedimg; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java index d21591db8..1b2148a1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/dto/TenantDTO.java @@ -1,13 +1,16 @@ package org.dromara.system.domain.dto; import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serial; import java.time.LocalDateTime; +import java.util.List; @Data public class TenantDTO { @@ -68,7 +71,7 @@ public class TenantDTO { private String companyType; @Schema(description = "经营类型") - private String businessTypes; + private List businessTypes; @Schema(description = "相关资质名称及附件") private String relatedimg; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java index a86570e00..6750c7243 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java @@ -2,16 +2,10 @@ package org.dromara.system.domain.vo; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.system.domain.SysTenant; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -73,12 +67,10 @@ public class SysTenantVo implements Serializable { private LocalDateTime joinTime; @Schema(description = "营业执照附件") - @TableField(typeHandler = JacksonTypeHandler.class) - private List attachmentimg; + private String attachmentimg; @Schema(description = "推广附件") - @TableField(typeHandler = JacksonTypeHandler.class) - private List promoteListimg; + private String promoteListimg; @Schema(description = "营业执照有效期") private LocalDateTime expireTime; @@ -90,12 +82,10 @@ public class SysTenantVo implements Serializable { private String companyType; @Schema(description = "经营类型") - @TableField(typeHandler = JacksonTypeHandler.class) private List businessTypes; @Schema(description = "相关资质名称及附件") - @TableField(typeHandler = JacksonTypeHandler.class) - private List relatedimg; + private String relatedimg; @Schema(description = "店铺id") private Long storeId; @@ -107,8 +97,7 @@ public class SysTenantVo implements Serializable { private String idCardType; @Schema(description = "证件图片") - @TableField(typeHandler = JacksonTypeHandler.class) - private List certificateimg; + private String certificateimg; @Schema(description = "负责人姓名") private String personName; @@ -163,8 +152,7 @@ public class SysTenantVo implements Serializable { private String contractYear; @Schema(description = "签约附件") - @TableField(typeHandler = JacksonTypeHandler.class) - private List contractAttachmentimg; + private String contractAttachmentimg; @Schema(description = "签约状态") private String signStatus; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 32edea070..9ee9f43e3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -121,7 +121,7 @@ public class SysTenantServiceImpl implements ISysTenantService { } /** - * 新增租户（拆分到两个表） + * 新增租户 */ @Override @Transactional(rollbackFor = Exception.class) diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/wechat/WechatPayConfig.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/wechat/WechatPayConfig.java index b4db4639f..23de97a34 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/wechat/WechatPayConfig.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/wechat/WechatPayConfig.java @@ -19,7 +19,7 @@ public class WechatPayConfig { private String mchId; private String mchSerialNo; private String apiV3Key; - private String privateKeyPath; // 支持 classpath: 或 file: 前缀 + private String privateKeyPath; private String transferNotifyUrl; private String appId; private String secret;