diff --git a/dax-pay/pom.xml b/dax-pay/pom.xml
index 490f087af..b3357fd60 100644
--- a/dax-pay/pom.xml
+++ b/dax-pay/pom.xml
@@ -145,7 +145,8 @@
cn.bootx
- mybatis-table-modify
+ mybatis-table-modify-mysql-boot-starter
+ 1.5.3.alpha1
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchAppPayConfigConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchAppPayConfigConvert.java
new file mode 100644
index 000000000..fb9e5f6e8
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchAppPayConfigConvert.java
@@ -0,0 +1,22 @@
+package cn.bootx.platform.daxpay.core.merchant.convert;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MchAppPayConfig;
+import cn.bootx.platform.daxpay.dto.merchant.MchAppPayConfigDto;
+import cn.bootx.platform.daxpay.param.merchant.MchAppPayConfigParam;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Mapper
+public interface MchAppPayConfigConvert {
+ MchAppPayConfigConvert CONVERT = Mappers.getMapper(MchAppPayConfigConvert.class);
+
+ MchAppPayConfig convert(MchAppPayConfigParam in);
+
+ MchAppPayConfigDto convert(MchAppPayConfig in);
+
+}
\ No newline at end of file
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java
new file mode 100644
index 000000000..5d77677a3
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MchApplicationConvert.java
@@ -0,0 +1,22 @@
+package cn.bootx.platform.daxpay.core.merchant.convert;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MchApplication;
+import cn.bootx.platform.daxpay.dto.merchant.MchApplicationDto;
+import cn.bootx.platform.daxpay.param.merchant.MchApplicationParam;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Mapper
+public interface MchApplicationConvert {
+ MchApplicationConvert CONVERT = Mappers.getMapper(MchApplicationConvert.class);
+
+ MchApplication convert(MchApplicationParam in);
+
+ MchApplicationDto convert(MchApplication in);
+
+}
\ No newline at end of file
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java
new file mode 100644
index 000000000..95b885324
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigManager.java
@@ -0,0 +1,33 @@
+package cn.bootx.platform.daxpay.core.merchant.dao;
+
+import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
+import cn.bootx.platform.daxpay.param.merchant.MchAppPayConfigParam;
+import cn.bootx.platform.daxpay.core.merchant.entity.MchAppPayConfig;
+import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
+import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Repository
+@RequiredArgsConstructor
+public class MchAppPayConfigManager extends BaseManager {
+
+ /**
+ * 分页
+ */
+ public Page page(PageParam pageParam, MchAppPayConfigParam param) {
+ Page mpPage = MpUtil.getMpPage(pageParam, MchAppPayConfig.class);
+ return this.lambdaQuery()
+ .select(this.getEntityClass(),MpUtil::excludeBigField)
+ .orderByDesc(MpIdEntity::getId)
+ .page(mpPage);
+ }
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java
new file mode 100644
index 000000000..3389f348c
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchAppPayConfigMapper.java
@@ -0,0 +1,14 @@
+package cn.bootx.platform.daxpay.core.merchant.dao;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MchAppPayConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Mapper
+public interface MchAppPayConfigMapper extends BaseMapper {
+}
\ No newline at end of file
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationManager.java
new file mode 100644
index 000000000..75b30d036
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationManager.java
@@ -0,0 +1,33 @@
+package cn.bootx.platform.daxpay.core.merchant.dao;
+
+import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
+import cn.bootx.platform.daxpay.param.merchant.MchApplicationParam;
+import cn.bootx.platform.daxpay.core.merchant.entity.MchApplication;
+import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
+import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Repository
+@RequiredArgsConstructor
+public class MchApplicationManager extends BaseManager {
+
+ /**
+ * 分页
+ */
+ public Page page(PageParam pageParam, MchApplicationParam param) {
+ Page mpPage = MpUtil.getMpPage(pageParam, MchApplication.class);
+ return this.lambdaQuery()
+ .select(this.getEntityClass(),MpUtil::excludeBigField)
+ .orderByDesc(MpIdEntity::getId)
+ .page(mpPage);
+ }
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java
new file mode 100644
index 000000000..daa7bef40
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MchApplicationMapper.java
@@ -0,0 +1,14 @@
+package cn.bootx.platform.daxpay.core.merchant.dao;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MchApplication;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Mapper
+public interface MchApplicationMapper extends BaseMapper {
+}
\ No newline at end of file
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java
index 6f0f6682c..e8dc1de8b 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java
@@ -1,27 +1,28 @@
package cn.bootx.platform.daxpay.core.merchant.entity;
import cn.bootx.mybatis.table.modify.annotation.DbColumn;
-import cn.bootx.mybatis.table.modify.annotation.DbTable;
+import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
+import cn.bootx.platform.daxpay.core.merchant.convert.MchAppPayConfigConvert;
+import cn.bootx.platform.daxpay.dto.merchant.MchAppPayConfigDto;
+import cn.bootx.platform.daxpay.param.merchant.MchAppPayConfigParam;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import lombok.experimental.FieldNameConstants;
/**
- * 商户应用支付配置
- * @author xxm
- * @date 2023/5/17
- */
+* 商户应用支付配置
+* @author xxm
+* @date 2023-05-19
+*/
@EqualsAndHashCode(callSuper = true)
@Data
-@FieldNameConstants
@Accessors(chain = true)
-@DbTable(comment = "商户应用支付配置")
-@TableName(value = "pay_mch_app_config")
-public class MchAppPayConfig extends MpBaseEntity {
+@TableName("pay_mch_app_config")
+public class MchAppPayConfig extends MpBaseEntity implements EntityBaseFunction {
+ /** 关联配置ID */
@DbColumn(comment = "关联配置ID")
private Long configId;
@@ -41,4 +42,14 @@ public class MchAppPayConfig extends MpBaseEntity {
@DbColumn(comment = "备注")
private String remark;
+ /** 创建对象 */
+ public static MchAppPayConfig init(MchAppPayConfigParam in) {
+ return MchAppPayConfigConvert.CONVERT.convert(in);
+ }
+
+ /** 转换成dto */
+ @Override
+ public MchAppPayConfigDto toDto() {
+ return MchAppPayConfigConvert.CONVERT.convert(this);
+ }
}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java
index 0613ce1ad..21978ff6e 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java
@@ -1,29 +1,26 @@
package cn.bootx.platform.daxpay.core.merchant.entity;
import cn.bootx.mybatis.table.modify.annotation.DbColumn;
-import cn.bootx.mybatis.table.modify.annotation.DbTable;
-import cn.bootx.mybatis.table.modify.impl.mysql.annotation.MySqlIndex;
-import cn.bootx.mybatis.table.modify.impl.mysql.constants.MySqlIndexType;
+import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
+import cn.bootx.platform.daxpay.core.merchant.convert.MchApplicationConvert;
+import cn.bootx.platform.daxpay.dto.merchant.MchApplicationDto;
+import cn.bootx.platform.daxpay.param.merchant.MchApplicationParam;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import lombok.experimental.FieldNameConstants;
/**
- * 商户应用
- * @author xxm
- * @date 2023/5/17
- */
+* 商户应用
+* @author xxm
+* @date 2023-05-19
+*/
@EqualsAndHashCode(callSuper = true)
-@MySqlIndex(columns = "app_no",type = MySqlIndexType.UNIQUE,comment = "应用编码唯一索引")
@Data
-@FieldNameConstants
@Accessors(chain = true)
-@DbTable(comment = "商户应用")
@TableName("pay_application")
-public class MchApplication extends MpBaseEntity {
+public class MchApplication extends MpBaseEntity implements EntityBaseFunction {
/** 应用编码 */
@DbColumn(comment = "应用编码")
@@ -45,4 +42,14 @@ public class MchApplication extends MpBaseEntity {
@DbColumn(comment = "备注")
private String remark;
+ /** 创建对象 */
+ public static MchApplication init(MchApplicationParam in) {
+ return MchApplicationConvert.CONVERT.convert(in);
+ }
+
+ /** 转换成dto */
+ @Override
+ public MchApplicationDto toDto() {
+ return MchApplicationConvert.CONVERT.convert(this);
+ }
}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
index 1cd0594e1..b150b40f8 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java
@@ -1,8 +1,8 @@
package cn.bootx.platform.daxpay.core.merchant.entity;
import cn.bootx.mybatis.table.modify.annotation.DbColumn;
-import cn.bootx.mybatis.table.modify.impl.mysql.annotation.MySqlIndex;
-import cn.bootx.mybatis.table.modify.impl.mysql.constants.MySqlIndexType;
+import cn.bootx.mybatis.table.modify.mybatis.mysq.annotation.MySqlIndex;
+import cn.bootx.mybatis.table.modify.mybatis.mysq.constants.MySqlIndexType;
import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
import cn.bootx.platform.daxpay.core.merchant.convert.MerchantInfoConvert;
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java
new file mode 100644
index 000000000..c5db2413a
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchAppPayConfigService.java
@@ -0,0 +1,75 @@
+package cn.bootx.platform.daxpay.core.merchant.service;
+
+import cn.bootx.platform.common.core.exception.DataNotExistException;
+import cn.bootx.platform.common.core.rest.PageResult;
+import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.common.core.util.ResultConvertUtil;
+import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import cn.bootx.platform.daxpay.core.merchant.dao.MchAppPayConfigManager;
+import cn.bootx.platform.daxpay.core.merchant.entity.MchAppPayConfig;
+import cn.bootx.platform.daxpay.dto.merchant.MchAppPayConfigDto;
+import cn.bootx.platform.daxpay.param.merchant.MchAppPayConfigParam;
+import cn.hutool.core.bean.BeanUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MchAppPayConfigService {
+ private final MchAppPayConfigManager mchAppPayConfigManager;
+
+ /**
+ * 添加
+ */
+ public void add(MchAppPayConfigParam param){
+ MchAppPayConfig mchAppPayConfig = MchAppPayConfig.init(param);
+ mchAppPayConfigManager.save(mchAppPayConfig);
+ }
+
+ /**
+ * 修改
+ */
+ public void update(MchAppPayConfigParam param){
+ MchAppPayConfig mchAppPayConfig = mchAppPayConfigManager.findById(param.getId()).orElseThrow(DataNotExistException::new);
+
+ BeanUtil.copyProperties(param,mchAppPayConfig, CopyOptions.create().ignoreNullValue());
+ mchAppPayConfigManager.updateById(mchAppPayConfig);
+ }
+
+ /**
+ * 分页
+ */
+ public PageResult page(PageParam pageParam,MchAppPayConfigParam mchAppPayConfigParam){
+ return MpUtil.convert2DtoPageResult(mchAppPayConfigManager.page(pageParam,mchAppPayConfigParam));
+ }
+
+ /**
+ * 获取单条
+ */
+ public MchAppPayConfigDto findById(Long id){
+ return mchAppPayConfigManager.findById(id).map(MchAppPayConfig::toDto).orElseThrow(DataNotExistException::new);
+ }
+
+ /**
+ * 获取全部
+ */
+ public List findAll(){
+ return ResultConvertUtil.dtoListConvert(mchAppPayConfigManager.findAll());
+ }
+
+ /**
+ * 删除
+ */
+ public void delete(Long id){
+ mchAppPayConfigManager.deleteById(id);
+ }
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchApplicationService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchApplicationService.java
new file mode 100644
index 000000000..31d79384e
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MchApplicationService.java
@@ -0,0 +1,76 @@
+package cn.bootx.platform.daxpay.core.merchant.service;
+
+import cn.bootx.platform.common.core.exception.DataNotExistException;
+import cn.bootx.platform.common.core.rest.PageResult;
+import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.common.core.util.ResultConvertUtil;
+import cn.bootx.platform.common.mybatisplus.util.MpUtil;
+import cn.bootx.platform.daxpay.core.merchant.dao.MchApplicationManager;
+import cn.bootx.platform.daxpay.core.merchant.entity.MchApplication;
+import cn.bootx.platform.daxpay.dto.merchant.MchApplicationDto;
+import cn.bootx.platform.daxpay.param.merchant.MchApplicationParam;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MchApplicationService {
+ private final MchApplicationManager mchApplicationManager;
+
+ /**
+ * 添加
+ */
+ public void add(MchApplicationParam param){
+ MchApplication mchApplication = MchApplication.init(param);
+ mchApplicationManager.save(mchApplication);
+ }
+
+ /**
+ * 修改
+ */
+ public void update(MchApplicationParam param){
+ MchApplication mchApplication = mchApplicationManager.findById(param.getId()).orElseThrow(DataNotExistException::new);
+
+ BeanUtil.copyProperties(param,mchApplication, CopyOptions.create().ignoreNullValue());
+ mchApplicationManager.updateById(mchApplication);
+ }
+
+ /**
+ * 分页
+ */
+ public PageResult page(PageParam pageParam,MchApplicationParam mchApplicationParam){
+ return MpUtil.convert2DtoPageResult(mchApplicationManager.page(pageParam,mchApplicationParam));
+ }
+
+ /**
+ * 获取单条
+ */
+ public MchApplicationDto findById(Long id){
+ return mchApplicationManager.findById(id).map(MchApplication::toDto).orElseThrow(DataNotExistException::new);
+ }
+
+ /**
+ * 获取全部
+ */
+ public List findAll(){
+ return ResultConvertUtil.dtoListConvert(mchApplicationManager.findAll());
+ }
+
+ /**
+ * 删除
+ */
+ public void delete(Long id){
+ mchApplicationManager.deleteById(id);
+ }
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigDto.java
new file mode 100644
index 000000000..50f996775
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchAppPayConfigDto.java
@@ -0,0 +1,31 @@
+package cn.bootx.platform.daxpay.dto.merchant;
+
+import cn.bootx.platform.common.core.rest.dto.BaseDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "商户应用支付配置")
+@Accessors(chain = true)
+public class MchAppPayConfigDto extends BaseDto {
+
+ @Schema(description = "关联配置ID")
+ private Long configId;
+ @Schema(description = "支付通道类型")
+ private String channel;
+ @Schema(description = "支付通道名称")
+ private String channelName;
+ @Schema(description = "状态")
+ private String state;
+ @Schema(description = "备注")
+ private String remark;
+
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java
new file mode 100644
index 000000000..17bab2d18
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MchApplicationDto.java
@@ -0,0 +1,31 @@
+package cn.bootx.platform.daxpay.dto.merchant;
+
+import cn.bootx.platform.common.core.rest.dto.BaseDto;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "商户应用")
+@Accessors(chain = true)
+public class MchApplicationDto extends BaseDto {
+
+ @Schema(description = "应用编码")
+ private String appNo;
+ @Schema(description = "名称")
+ private String name;
+ @Schema(description = "商户号")
+ private String mchNo;
+ @Schema(description = "状态类型")
+ private String state;
+ @Schema(description = "备注")
+ private String remark;
+
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchAppPayConfigParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchAppPayConfigParam.java
new file mode 100644
index 000000000..accf0e3b1
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchAppPayConfigParam.java
@@ -0,0 +1,31 @@
+package cn.bootx.platform.daxpay.param.merchant;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 商户应用支付配置
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Data
+@Schema(title = "商户应用支付配置")
+@Accessors(chain = true)
+public class MchAppPayConfigParam {
+
+ @Schema(description= "主键")
+ private Long id;
+
+ @Schema(description = "关联配置ID")
+ private Long configId;
+ @Schema(description = "支付通道类型")
+ private String channel;
+ @Schema(description = "支付通道名称")
+ private String channelName;
+ @Schema(description = "状态")
+ private String state;
+ @Schema(description = "备注")
+ private String remark;
+
+}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java
new file mode 100644
index 000000000..f3021c89b
--- /dev/null
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/param/merchant/MchApplicationParam.java
@@ -0,0 +1,31 @@
+package cn.bootx.platform.daxpay.param.merchant;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 商户应用
+ * @author xxm
+ * @date 2023-05-19
+ */
+@Data
+@Schema(title = "商户应用")
+@Accessors(chain = true)
+public class MchApplicationParam {
+
+ @Schema(description= "主键")
+ private Long id;
+
+ @Schema(description = "应用编码")
+ private String appNo;
+ @Schema(description = "名称")
+ private String name;
+ @Schema(description = "商户号")
+ private String mchNo;
+ @Schema(description = "状态类型")
+ private String state;
+ @Schema(description = "备注")
+ private String remark;
+
+}
diff --git a/pom.xml b/pom.xml
index d8ba8d470..04f77e6ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
1.3.81
2.2.4
2.7.0
- 1.5.1.beta2
+ 1.5.3.alpha1