dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-03 11:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 商户应用类型命名错误

Browse Source
This commit is contained in:
DaxPay
2024-10-29 16:11:38 +08:00
parent 87c9b1a8a5
commit f50e02046a
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/common/context/MchAppLocal.java
View File

@@ -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;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/merchant/MchAppManager.java
View File

@@ -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<MchAppMapper, MchApp> {
/**
* 根据状态查询所有
*/
public List<MchApp> findAllByStatus(MchAppStautsEnum status) {
public List<MchApp> findAllByStatus(MchAppStatusEnum status) {
return findAllByField(MchApp::getStatus, status.getCode());
}

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/entity/merchant/MchApp.java
View File

@@ -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<MchAppResult> {
/**
* 应用状态
* @see MchAppStautsEnum
* @see MchAppStatusEnum
*/
private String status;

2
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStautsEnum.java → daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/enums/MchAppStatusEnum.java
View File

@@ -11,7 +11,7 @@ import lombok.Getter;
*/
@Getter
@AllArgsConstructor
public enum MchAppStautsEnum {
public enum MchAppStatusEnum {
/**
* 禁用
*/

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/merchant/MchAppResult.java
View File

@@ -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;

4
daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/merchant/MchAppService.java
View File

@@ -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);
}
/**