From f50e02046a0470bdcc8c77a484fa0608072e9f10 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Tue, 29 Oct 2024 16:11:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/daxpay/service/common/context/MchAppLocal.java | 4 ++-- .../dromara/daxpay/service/dao/merchant/MchAppManager.java | 4 ++-- .../org/dromara/daxpay/service/entity/merchant/MchApp.java | 4 ++-- .../enums/{MchAppStautsEnum.java => MchAppStatusEnum.java} | 2 +- .../dromara/daxpay/service/result/merchant/MchAppResult.java | 4 ++-- .../daxpay/service/service/merchant/MchAppService.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/{MchAppStautsEnum.java => MchAppStatusEnum.java} (93%) diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/common/context/MchAppLocal.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/common/context/MchAppLocal.java index 67c9b2c6a..0ddeb4a6c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/common/context/MchAppLocal.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/common/context/MchAppLocal.java @@ -1,7 +1,7 @@ package org.dromara.daxpay.service.common.context; import org.dromara.daxpay.core.enums.MerchantNotifyTypeEnum; -import org.dromara.daxpay.service.enums.MchAppStautsEnum; +import org.dromara.daxpay.service.enums.MchAppStatusEnum; import lombok.Data; import lombok.experimental.Accessors; @@ -43,7 +43,7 @@ public class MchAppLocal { /** * 应用状态 - * @see MchAppStautsEnum + * @see MchAppStatusEnum */ private String status; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/merchant/MchAppManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/merchant/MchAppManager.java index e88f27edf..430f8ee11 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/merchant/MchAppManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/merchant/MchAppManager.java @@ -5,7 +5,7 @@ import cn.bootx.platform.common.mybatisplus.query.generator.QueryGenerator; import cn.bootx.platform.common.mybatisplus.util.MpUtil; import cn.bootx.platform.core.rest.param.PageParam; import org.dromara.daxpay.service.entity.merchant.MchApp; -import org.dromara.daxpay.service.enums.MchAppStautsEnum; +import org.dromara.daxpay.service.enums.MchAppStatusEnum; import org.dromara.daxpay.service.param.merchant.MchAppQuery; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -65,7 +65,7 @@ public class MchAppManager extends BaseManager { /** * 根据状态查询所有 */ - public List findAllByStatus(MchAppStautsEnum status) { + public List findAllByStatus(MchAppStatusEnum status) { return findAllByField(MchApp::getStatus, status.getCode()); } diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/merchant/MchApp.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/merchant/MchApp.java index 7dcefda03..3f19ca45a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/merchant/MchApp.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/merchant/MchApp.java @@ -5,7 +5,7 @@ import cn.bootx.platform.common.mybatisplus.function.ToResult; import org.dromara.daxpay.core.enums.SignTypeEnum; import org.dromara.daxpay.core.enums.MerchantNotifyTypeEnum; import org.dromara.daxpay.service.convert.merchant.MchAppConvert; -import org.dromara.daxpay.service.enums.MchAppStautsEnum; +import org.dromara.daxpay.service.enums.MchAppStatusEnum; import org.dromara.daxpay.service.result.merchant.MchAppResult; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; @@ -56,7 +56,7 @@ public class MchApp extends MpBaseEntity implements ToResult { /** * 应用状态 - * @see MchAppStautsEnum + * @see MchAppStatusEnum */ private String status; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStautsEnum.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStatusEnum.java similarity index 93% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStautsEnum.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStatusEnum.java index f09c54c67..9327217cf 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStautsEnum.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStatusEnum.java @@ -11,7 +11,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum MchAppStautsEnum { +public enum MchAppStatusEnum { /** * 禁用 */ diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/merchant/MchAppResult.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/merchant/MchAppResult.java index 8439e35cd..ba9e55bb5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/merchant/MchAppResult.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/merchant/MchAppResult.java @@ -3,7 +3,7 @@ package org.dromara.daxpay.service.result.merchant; import cn.bootx.platform.core.result.BaseResult; import org.dromara.daxpay.core.enums.MerchantNotifyTypeEnum; import org.dromara.daxpay.core.enums.SignTypeEnum; -import org.dromara.daxpay.service.enums.MchAppStautsEnum; +import org.dromara.daxpay.service.enums.MchAppStatusEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -55,7 +55,7 @@ public final class MchAppResult extends BaseResult { /** * 状态 - * @see MchAppStautsEnum + * @see MchAppStatusEnum */ @Schema(description = "状态") private String status; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/merchant/MchAppService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/merchant/MchAppService.java index 159685f36..98e7de8ab 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/merchant/MchAppService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/merchant/MchAppService.java @@ -17,7 +17,7 @@ import org.dromara.daxpay.service.dao.config.ChannelConfigManager; import org.dromara.daxpay.service.dao.merchant.MchAppManager; import org.dromara.daxpay.service.entity.config.ChannelConfig; import org.dromara.daxpay.service.entity.merchant.MchApp; -import org.dromara.daxpay.service.enums.MchAppStautsEnum; +import org.dromara.daxpay.service.enums.MchAppStatusEnum; import org.dromara.daxpay.service.param.merchant.MchAppParam; import org.dromara.daxpay.service.param.merchant.MchAppQuery; import org.dromara.daxpay.service.result.merchant.MchAppResult; @@ -47,7 +47,7 @@ public class MchAppService { MchApp entity = MchAppConvert.CONVERT.toEntity(param); // 生成应用号 entity.setAppId(this.generateAppId()) - .setStatus(MchAppStautsEnum.ENABLE.getCode()); + .setStatus(MchAppStatusEnum.ENABLE.getCode()); mchAppManager.save(entity); } /**