feat 增加商户相关类, 调整包结构和名称

README.md

@@ -38,6 +38,21 @@ Dax-Pay是Bootx-Platform的子项目之一，主要是对支付收单和账务
 - 前端: [Vue3前端启动流程](https://https://daxpay.doc.bootx.cn/)
 - 支付通道配置: [支付通道配置](https://https://daxpay.doc.bootx.cn/)
 
+## 名词解释
+
+| 名词   | 英文或简写    | 备注                                             |
+|------|----------|------------------------------------------------|
+| 支付通道 | Channel  | 主要包括第三方支付平台，如支付宝、微信、云闪付等                       |
+| 支付方式 | PayWay   | 主要是进行支付时的方式，如扫码支付、H5支付、APP支付等，一种支付通道通常会有多种支付方式 |
+| 支付策略 | Strategy | 对支付通道和支付方式进行封装，可以完成一种支付操作                      |
+| 聚合支付 |          | 通常是扫码或收款时，根据客户使用应用的不同，自动识别是哪种支付通道，并进行支付        |
+| 组合支付 |          | 同时使用多种支付通道进行支付，如同时使用余额+现金+储值卡+微信支付进行支付         |
+| 商户   | merchant |                                                |
+| 商户应用 | mchApp   |                                                |
+| 分账   |          |                                                |
+| 对账   |          |                                                |
+
+
 ## 🥞项目结构(dax-pay)
 ```lua
 dax-pay

dax-pay/pom.xml

@@ -116,21 +116,32 @@
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-starter-file</artifactId>
         </dependency>
+
+        <!-- 代码生成模块 -->
+        <dependency>
+            <groupId>cn.bootx.platform</groupId>
+            <artifactId>common-starter-code-gen</artifactId>
+        </dependency>
+
         <!-- websocket模块 -->
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-websocket</artifactId>
         </dependency>
+
         <!-- 定时任务 -->
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-starter-quartz</artifactId>
         </dependency>
-        <!-- 消息队列 -->
+
+        <!-- 消息队列 amqp -->
         <dependency>
             <groupId>cn.bootx.platform</groupId>
             <artifactId>common-rabbitmq</artifactId>
         </dependency>
+        <!-- 消息队列 rocketMQ-->
+
         <!-- 自动建表 -->
         <dependency>
             <groupId>cn.bootx</groupId>

dax-pay/src/main/java/cn/bootx/platform/daxpay/code/PaymentErrorCode.java

@@ -6,7 +6,7 @@ package cn.bootx.platform.daxpay.code;
  * @author xxm
  * @date 2020/12/7
  */
-public interface PaymentCenterErrorCode {
+public interface PaymentErrorCode {
 
     // 支付过程相关
     /**

dax-pay/src/main/java/cn/bootx/platform/daxpay/code/pay/PayWayExtraCode.java

@@ -6,7 +6,7 @@ package cn.bootx.platform.daxpay.code.pay;
  * @author xxm
  * @date 2022/2/27
  */
-public interface PayModelExtraCode {
+public interface PayWayExtraCode {
 
     /** 付款码 */
     String AUTH_CODE = "authCode";

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/AlipayConfigController.java

@@ -5,7 +5,7 @@ import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.dto.KeyValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AlipayConfigService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AlipayConfigService;
 import cn.bootx.platform.daxpay.dto.paymodel.alipay.AlipayConfigDto;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigParam;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigQuery;

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/MerchantInfoController.java

@@ -0,0 +1,67 @@
+package cn.bootx.platform.daxpay.controller;
+
+import cn.bootx.platform.common.core.rest.PageResult;
+import cn.bootx.platform.common.core.rest.Res;
+import cn.bootx.platform.common.core.rest.ResResult;
+import cn.bootx.platform.common.core.rest.param.PageParam;
+import cn.bootx.platform.daxpay.core.merchant.service.MerchantInfoService;
+import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto;
+import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 商户
+ * @author xxm
+ * @date 2023-05-17
+ */
+@Tag(name ="商户")
+@RestController
+@RequestMapping("/merchant")
+@RequiredArgsConstructor
+public class MerchantInfoController {
+    private final MerchantInfoService merchantInfoService;
+
+    @Operation( summary = "添加")
+    @PostMapping(value = "/add")
+    public ResResult<Void> add(@RequestBody MerchantInfoParam param){
+        merchantInfoService.add(param);
+        return Res.ok();
+    }
+
+    @Operation( summary = "修改")
+    @PostMapping(value = "/update")
+    public ResResult<Void> update(@RequestBody MerchantInfoParam param){
+        merchantInfoService.update(param);
+        return Res.ok();
+    }
+
+    @Operation( summary = "删除")
+    @DeleteMapping(value = "/delete")
+    public ResResult<Void> delete(Long id){
+        merchantInfoService.delete(id);
+        return Res.ok();
+    }
+
+    @Operation( summary = "通过ID查询")
+    @GetMapping(value = "/findById")
+    public ResResult<MerchantInfoDto> findById(Long id){
+        return Res.ok(merchantInfoService.findById(id));
+    }
+
+    @Operation( summary = "查询所有")
+    @GetMapping(value = "/findAll")
+    public ResResult<List<MerchantInfoDto>> findAll(){
+        return Res.ok(merchantInfoService.findAll());
+    }
+
+    @Operation( summary = "分页查询")
+    @GetMapping(value = "/page")
+    public ResResult<PageResult<MerchantInfoDto>> page(PageParam pageParam, MerchantInfoParam merchantInfoParam){
+        return Res.ok(merchantInfoService.page(pageParam,merchantInfoParam));
+    }
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/PayCallbackController.java

@@ -1,8 +1,8 @@
 package cn.bootx.platform.daxpay.controller;
 
 import cn.bootx.platform.common.core.annotation.IgnoreAuth;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AliPayCallbackService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCallbackService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPayCallbackService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCallbackService;
 import com.ijpay.alipay.AliPayApi;
 import com.ijpay.core.kit.HttpKit;
 import com.ijpay.core.kit.WxPayKit;

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/VoucherController.java

@@ -4,8 +4,8 @@ import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.service.VoucherQueryService;
+import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherQueryService;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.service.VoucherService;
+import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherService;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherDto;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherGenerationParam;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletController.java

@@ -1,7 +1,7 @@
 package cn.bootx.platform.daxpay.controller;
 
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletQueryService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletQueryService;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletService;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletDto;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletInfoDto;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletPayParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WalletLogController.java

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletLogService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletLogService;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletLogDto;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletLogQueryParam;
 import io.swagger.v3.oas.annotations.Operation;

dax-pay/src/main/java/cn/bootx/platform/daxpay/controller/WeChatPayConfigController.java

@@ -5,7 +5,7 @@ import cn.bootx.platform.common.core.rest.Res;
 import cn.bootx.platform.common.core.rest.ResResult;
 import cn.bootx.platform.common.core.rest.dto.KeyValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPayConfigService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayConfigService;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPayConfigDto;
 import cn.bootx.platform.daxpay.param.paymodel.wechat.WeChatPayConfigParam;
 import io.swagger.v3.oas.annotations.Operation;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/cashier/service/CashierService.java

@@ -1,15 +1,15 @@
 package cn.bootx.platform.daxpay.core.cashier.service;
 
 import cn.bootx.platform.daxpay.code.pay.PayChannelCode;
-import cn.bootx.platform.daxpay.code.pay.PayModelExtraCode;
+import cn.bootx.platform.daxpay.code.pay.PayWayExtraCode;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.code.pay.PayWayCode;
 import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode;
 import cn.bootx.platform.daxpay.core.aggregate.entity.AggregatePayInfo;
 import cn.bootx.platform.daxpay.core.aggregate.service.AggregateService;
 import cn.bootx.platform.daxpay.core.pay.service.PayService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import cn.bootx.platform.daxpay.dto.pay.PayResult;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.exception.payment.PayUnsupportedMethodException;
@@ -74,9 +74,9 @@ public class CashierService {
 
         // 处理附加参数
         HashMap<String, String> map = new HashMap<>(1);
-        map.put(PayModelExtraCode.AUTH_CODE, param.getAuthCode());
+        map.put(PayWayExtraCode.AUTH_CODE, param.getAuthCode());
-        map.put(PayModelExtraCode.OPEN_ID, param.getOpenId());
+        map.put(PayWayExtraCode.OPEN_ID, param.getOpenId());
-        map.put(PayModelExtraCode.VOUCHER_NO, param.getVoucherNo());
+        map.put(PayWayExtraCode.VOUCHER_NO, param.getVoucherNo());
         String extraParamsJson = PayModelUtil.buildExtraParamsJson(param.getPayChannel(), map);
         payModeParam.setExtraParamsJson(extraParamsJson);
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/convert/AlipayConvert.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.convert;
+package cn.bootx.platform.daxpay.core.channel.alipay.convert;
 
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import cn.bootx.platform.daxpay.dto.paymodel.alipay.AlipayConfigDto;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigParam;
 import org.mapstruct.Mapper;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentManager.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.dao;
+package cn.bootx.platform.daxpay.core.channel.alipay.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AliPayment;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayment;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AliPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.dao;
+package cn.bootx.platform.daxpay.core.channel.alipay.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AliPayment;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigManager.java

@@ -1,9 +1,9 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.dao;
+package cn.bootx.platform.daxpay.core.channel.alipay.dao;
 
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigQuery;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/dao/AlipayConfigMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.dao;
+package cn.bootx.platform.daxpay.core.channel.alipay.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AliPayment.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.entity;
+package cn.bootx.platform.daxpay.core.channel.alipay.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import cn.bootx.platform.daxpay.dto.paymodel.alipay.AliPaymentDto;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.TableName;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/entity/AlipayConfig.java

@@ -1,10 +1,12 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.entity;
+package cn.bootx.platform.daxpay.core.channel.alipay.entity;
 
+import cn.bootx.mybatis.table.modify.annotation.DbColumn;
+import cn.bootx.mybatis.table.modify.annotation.DbTable;
 import cn.bootx.platform.common.core.annotation.BigField;
 import cn.bootx.platform.common.core.annotation.EncryptionField;
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.convert.AlipayConvert;
+import cn.bootx.platform.daxpay.core.channel.alipay.convert.AlipayConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.alipay.AlipayConfigDto;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigParam;
 import cn.hutool.core.collection.CollUtil;
@@ -25,73 +27,100 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors(chain = true)
+@DbTable(comment = "支付宝支付配置")
 @TableName("pay_alipay_config")
 public class AlipayConfig extends MpBaseEntity implements EntityBaseFunction<AlipayConfigDto> {
 
     /** 名称 */
+    @DbColumn(comment = "名称")
     private String name;
 
+    /** 商户Id */
+    @DbColumn(comment = "商户Id")
+    private Long merchantId;
+
+    /** 商户应用Id */
+    @DbColumn(comment = "商户应用Id")
+    private Long mchAppId;
+
     /** 支付宝商户appId */
+    @DbColumn(comment = "支付宝商户appId")
     private String appId;
 
     /** 服务器异步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 */
+    @DbColumn(comment = "异步通知页面路径")
     private String notifyUrl;
 
     /**
      * 页面跳转同步通知页面路径 需http://或者https://格式的完整路径，不能加?id=123这类自定义参数，必须外网可以正常访问 商户可以自定义同步跳转地址
      */
+    @DbColumn(comment = "同步通知页面路径")
     private String returnUrl;
 
     /** 请求网关地址 */
+    @DbColumn(comment = "")
     private String serverUrl;
 
     /** 认证类型 证书/公钥 */
+    @DbColumn(comment = "认证类型")
     private Integer authType;
 
-    /** 签名类型 */
+    /** 签名类型 RSA/RSA2 */
+    @DbColumn(comment = "签名类型 RSA/RSA2")
     public String signType;
 
     /** 支付宝公钥 */
     @BigField
+    @DbColumn(comment = "支付宝公钥")
     public String alipayPublicKey;
 
     /** 私钥 */
     @BigField
     @EncryptionField
+    @DbColumn(comment = "私钥")
     private String privateKey;
 
     /** 应用公钥证书 */
     @BigField
     @EncryptionField
+    @DbColumn(comment = "应用公钥证书")
     private String appCert;
 
     /** 支付宝公钥证书 */
     @BigField
     @EncryptionField
+    @DbColumn(comment = "支付宝公钥证书")
     private String alipayCert;
 
     /** 支付宝CA根证书 */
     @BigField
     @EncryptionField
+    @DbColumn(comment = "支付宝CA根证书")
     private String alipayRootCert;
 
     /** 是否沙箱环境 */
+    @DbColumn(comment = "是否沙箱环境")
     private boolean sandbox;
 
     /** 超时配置 */
+    @DbColumn(comment = "超时配置")
     private Integer expireTime;
 
     /** 可用支付方式 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @DbColumn(comment = "可用支付方式")
     private String payWays;
 
     /** 是否启用 */
+    @DbColumn(comment = "是否启用")
     private Boolean activity;
 
     /** 状态 暂时没什么用 */
+    @DbColumn(comment = "状态 暂时没什么用")
     private Integer state;
 
     /** 备注 */
+    @DbColumn(comment = "备注")
     private String remark;
 
     @Override

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCallbackService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.util.CertUtil;
@@ -9,8 +9,8 @@ import cn.bootx.platform.daxpay.code.paymodel.AliPayCode;
 import cn.bootx.platform.daxpay.core.notify.dao.PayNotifyRecordManager;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayCallbackStrategy;
 import cn.bootx.platform.daxpay.core.pay.service.PayCallbackService;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.dao.AlipayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.alipay.dao.AlipayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayCancelService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.common.spring.exception.RetryableException;
 import cn.bootx.platform.daxpay.code.paymodel.AliPayCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPayService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.code.pay.PayWayCode;
@@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.code.paymodel.AliPayCode;
 import cn.bootx.platform.daxpay.code.paymodel.AliPayWay;
 import cn.bootx.platform.daxpay.core.pay.local.AsyncPayInfoLocal;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import cn.bootx.platform.daxpay.dto.pay.AsyncPayInfo;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AliPaymentService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.daxpay.code.pay.PayChannelCode;
@@ -6,8 +6,8 @@ import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.core.pay.local.AsyncPayInfoLocal;
 import cn.bootx.platform.daxpay.core.payment.dao.PaymentManager;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.dao.AliPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.alipay.dao.AliPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AliPayment;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AliPayment;
 import cn.bootx.platform.daxpay.dto.pay.AsyncPayInfo;
 import cn.bootx.platform.daxpay.dto.payment.PayChannelInfo;
 import cn.bootx.platform.daxpay.dto.payment.RefundableInfo;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipayConfigService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.PageResult;
@@ -6,8 +6,8 @@ import cn.bootx.platform.common.core.rest.dto.KeyValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.daxpay.code.paymodel.AliPayWay;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.dao.AlipayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.alipay.dao.AlipayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
 import cn.bootx.platform.daxpay.dto.paymodel.alipay.AlipayConfigDto;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.paymodel.alipay.AlipayConfigParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/alipay/service/AlipaySyncService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.alipay.service;
+package cn.bootx.platform.daxpay.core.channel.alipay.service;
 
 import cn.bootx.platform.daxpay.code.pay.PaySyncStatus;
 import cn.bootx.platform.daxpay.code.paymodel.AliPayCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/base/entity/BasePayment.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.base.entity;
+package cn.bootx.platform.daxpay.core.channel.base.entity;
 
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.cash.dao;
+package cn.bootx.platform.daxpay.core.channel.cash.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.cash.entity.CashPayment;
+import cn.bootx.platform.daxpay.core.channel.cash.entity.CashPayment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/dao/CashPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.cash.dao;
+package cn.bootx.platform.daxpay.core.channel.cash.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.cash.entity.CashPayment;
+import cn.bootx.platform.daxpay.core.channel.cash.entity.CashPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/entity/CashPayment.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.cash.entity;
+package cn.bootx.platform.daxpay.core.channel.cash.entity;
 
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/cash/service/CashService.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.cash.service;
+package cn.bootx.platform.daxpay.core.channel.cash.service;
 
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
+import cn.bootx.platform.daxpay.core.channel.cash.dao.CashPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.cash.entity.CashPayment;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.cash.dao.CashPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.cash.entity.CashPayment;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;
 import cn.bootx.platform.daxpay.param.pay.PayParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/convert/UnionPayConvert.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.convert;
+package cn.bootx.platform.daxpay.core.channel.union.convert;
 
-import cn.bootx.platform.daxpay.core.paymodel.union.entity.UnionPayConfig;
+import cn.bootx.platform.daxpay.core.channel.union.entity.UnionPayConfig;
 import cn.bootx.platform.daxpay.dto.paymodel.union.UnionPayConfigDto;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.dao;
+package cn.bootx.platform.daxpay.core.channel.union.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.union.entity.UnionPayConfig;
+import cn.bootx.platform.daxpay.core.channel.union.entity.UnionPayConfig;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPayConfigMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.dao;
+package cn.bootx.platform.daxpay.core.channel.union.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.union.entity.UnionPayConfig;
+import cn.bootx.platform.daxpay.core.channel.union.entity.UnionPayConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.dao;
+package cn.bootx.platform.daxpay.core.channel.union.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.union.entity.UnionPayment;
+import cn.bootx.platform.daxpay.core.channel.union.entity.UnionPayment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/dao/UnionPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.dao;
+package cn.bootx.platform.daxpay.core.channel.union.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.union.entity.UnionPayment;
+import cn.bootx.platform.daxpay.core.channel.union.entity.UnionPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayConfig.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.entity;
+package cn.bootx.platform.daxpay.core.channel.union.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.bootx.platform.daxpay.core.paymodel.union.convert.UnionPayConvert;
+import cn.bootx.platform.daxpay.core.channel.union.convert.UnionPayConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.union.UnionPayConfigDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/entity/UnionPayment.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.entity;
+package cn.bootx.platform.daxpay.core.channel.union.entity;
 
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayConfigService.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.service;
+package cn.bootx.platform.daxpay.core.channel.union.service;
 
-import cn.bootx.platform.daxpay.core.paymodel.union.dao.UnionPayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.union.dao.UnionPayConfigManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPayService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.service;
+package cn.bootx.platform.daxpay.core.channel.union.service;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/union/service/UnionPaymentService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.union.service;
+package cn.bootx.platform.daxpay.core.channel.union.service;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/convert/VoucherConvert.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.convert;
+package cn.bootx.platform.daxpay.core.channel.voucher.convert;
 
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherPayment;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayment;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherDto;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherPaymentDto;
 import org.mapstruct.Mapper;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherLog;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherLogMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherLog;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherManager.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherParam;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherPayment;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/dao/VoucherPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.dao;
+package cn.bootx.platform.daxpay.core.channel.voucher.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherPayment;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/Voucher.java

@@ -1,9 +1,9 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.entity;
+package cn.bootx.platform.daxpay.core.channel.voucher.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.platform.daxpay.code.paymodel.VoucherCode;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.convert.VoucherConvert;
+import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherLog.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.entity;
+package cn.bootx.platform.daxpay.core.channel.voucher.entity;
 
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
 import cn.bootx.platform.daxpay.code.paymodel.VoucherCode;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/entity/VoucherPayment.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.entity;
+package cn.bootx.platform.daxpay.core.channel.voucher.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.convert.VoucherConvert;
+import cn.bootx.platform.daxpay.core.channel.voucher.convert.VoucherConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherPaymentDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherLogService.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.service;
+package cn.bootx.platform.daxpay.core.channel.voucher.service;
 
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherLogManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java

@@ -1,16 +1,16 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.service;
+package cn.bootx.platform.daxpay.core.channel.voucher.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
 import cn.bootx.platform.daxpay.code.paymodel.VoucherCode;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherLogManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherLog;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayment;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherPayment;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherPayParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPaymentService.java

@@ -1,13 +1,13 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.service;
+package cn.bootx.platform.daxpay.core.channel.voucher.service;
 
 import cn.bootx.platform.common.core.exception.BizException;
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherPayment;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherPayment;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;
 import cn.bootx.platform.daxpay.param.pay.PayParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherQueryService.java

@@ -1,11 +1,11 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.service;
+package cn.bootx.platform.daxpay.core.channel.voucher.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.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
 import cn.bootx.platform.daxpay.dto.paymodel.voucher.VoucherDto;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherService.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.voucher.service;
+package cn.bootx.platform.daxpay.core.channel.voucher.service;
 
 import cn.bootx.platform.daxpay.code.paymodel.VoucherCode;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherLogManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherLogManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.dao.VoucherManager;
+import cn.bootx.platform.daxpay.core.channel.voucher.dao.VoucherManager;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.VoucherLog;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.VoucherLog;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherGenerationParam;
 import cn.bootx.platform.daxpay.param.paymodel.voucher.VoucherImportParam;
 import cn.hutool.core.util.IdUtil;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/convert/WalletConvert.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.convert;
+package cn.bootx.platform.daxpay.core.channel.wallet.convert;
 
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletLog;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayment;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletPayment;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletDto;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletLogDto;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletPaymentDto;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogManager.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletLog;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletLogQueryParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletLogMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletLog;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletPayParam;
 import cn.bootx.platform.iam.core.user.entity.UserInfo;
 import cn.bootx.platform.iam.param.user.UserInfoParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
 import cn.bootx.platform.iam.core.user.entity.UserInfo;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentManager.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayment;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletPayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.dao;
+package cn.bootx.platform.daxpay.core.channel.wallet.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletPayment;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/Wallet.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.entity;
+package cn.bootx.platform.daxpay.core.channel.wallet.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.convert.WalletConvert;
+import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletLog.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.entity;
+package cn.bootx.platform.daxpay.core.channel.wallet.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.convert.WalletConvert;
+import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletLogDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/entity/WalletPayment.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.entity;
+package cn.bootx.platform.daxpay.core.channel.wallet.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.convert.WalletConvert;
+import cn.bootx.platform.daxpay.core.channel.wallet.convert.WalletConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletPaymentDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletLogService.java

@@ -1,9 +1,9 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.service;
+package cn.bootx.platform.daxpay.core.channel.wallet.service;
 
 import cn.bootx.platform.common.core.rest.PageResult;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletLogManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletLogDto;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletLogQueryParam;
 import cn.bootx.platform.starter.auth.util.SecurityUtil;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPayService.java

@@ -1,15 +1,15 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.service;
+package cn.bootx.platform.daxpay.core.channel.wallet.service;
 
 import cn.bootx.platform.common.core.exception.BizException;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.code.paymodel.WalletCode;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletLogManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletLog;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletPayment;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayment;
 import cn.bootx.platform.daxpay.exception.waller.WalletLackOfBalanceException;
 import cn.bootx.platform.daxpay.exception.waller.WalletNotExistsException;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletPaymentService.java

@@ -1,12 +1,12 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.service;
+package cn.bootx.platform.daxpay.core.channel.wallet.service;
 
 import cn.bootx.platform.common.core.exception.BizException;
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletPayment;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletPayment;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;
 import cn.bootx.platform.daxpay.param.pay.PayParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletQueryService.java

@@ -1,11 +1,11 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.service;
+package cn.bootx.platform.daxpay.core.channel.wallet.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.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletDto;
 import cn.bootx.platform.daxpay.dto.paymodel.wallet.WalletInfoDto;
 import cn.bootx.platform.daxpay.param.paymodel.wallet.WalletPayParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java

@@ -1,13 +1,13 @@
-package cn.bootx.platform.daxpay.core.paymodel.wallet.service;
+package cn.bootx.platform.daxpay.core.channel.wallet.service;
 
 import cn.bootx.platform.common.core.exception.BizException;
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
 import cn.bootx.platform.daxpay.code.paymodel.WalletCode;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletLogManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletLogManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.dao.WalletManager;
+import cn.bootx.platform.daxpay.core.channel.wallet.dao.WalletManager;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.WalletLog;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.WalletLog;
 import cn.bootx.platform.daxpay.exception.waller.WalletBannedException;
 import cn.bootx.platform.daxpay.exception.waller.WalletLogError;
 import cn.bootx.platform.daxpay.exception.waller.WalletNotExistsException;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/convert/WeChatConvert.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.convert;
+package cn.bootx.platform.daxpay.core.channel.wechat.convert;
 
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPayConfigDto;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPaymentDto;
 import cn.bootx.platform.daxpay.param.paymodel.wechat.WeChatPayConfigParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigManager.java

@@ -1,10 +1,10 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.dao;
+package cn.bootx.platform.daxpay.core.channel.wechat.dao;
 
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.base.MpIdEntity;
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import cn.bootx.platform.daxpay.param.paymodel.wechat.WeChatPayConfigParam;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPayConfigMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.dao;
+package cn.bootx.platform.daxpay.core.channel.wechat.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentManager.java

@@ -1,7 +1,7 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.dao;
+package cn.bootx.platform.daxpay.core.channel.wechat.dao;
 
 import cn.bootx.platform.common.mybatisplus.impl.BaseManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/dao/WeChatPaymentMapper.java

@@ -1,6 +1,6 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.dao;
+package cn.bootx.platform.daxpay.core.channel.wechat.dao;
 
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayConfig.java

@@ -1,11 +1,12 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.entity;
+package cn.bootx.platform.daxpay.core.channel.wechat.entity;
 
+import cn.bootx.mybatis.table.modify.annotation.DbColumn;
+import cn.bootx.mybatis.table.modify.annotation.DbTable;
 import cn.bootx.platform.common.core.annotation.BigField;
 import cn.bootx.platform.common.core.annotation.EncryptionField;
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
 import cn.bootx.platform.common.mybatisplus.base.MpBaseEntity;
-import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode;
+import cn.bootx.platform.daxpay.core.channel.wechat.convert.WeChatConvert;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.convert.WeChatConvert;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPayConfigDto;
 import cn.bootx.platform.daxpay.param.paymodel.wechat.WeChatPayConfigParam;
 import cn.hutool.core.collection.CollUtil;
@@ -18,89 +19,113 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 微信支付
+ * 微信支付配置
  *
  * @author xxm
  * @date 2021/3/1
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
+@DbTable(comment = "微信支付配置")
 @Accessors(chain = true)
 @TableName("pay_wechat_pay_config")
 public class WeChatPayConfig extends MpBaseEntity implements EntityBaseFunction<WeChatPayConfigDto> {
 
     /** 名称 */
+    @DbColumn(comment = "名称")
     private String name;
 
     /** 微信商户号 */
+    @DbColumn(comment = "微信商户号")
     private String mchId;
 
+    /** 商户应用Id */
+    @DbColumn(comment = "商户应用Id")
+    private Long mchAppId;
+
     /** 微信应用appId */
+    @DbColumn(comment = "微信应用appId")
     private String appId;
 
-    /**
+//    /**
-     * api版本
+//     * api版本
-     * @see WeChatPayCode#API_V2
+//     * @see WeChatPayCode#API_V2
-     */
+//     */
-    private String apiVersion;
+//    @DbColumn(comment = "api版本")
+//    private String apiVersion;
 
     /** 商户平台「API安全」中的 APIv2 密钥 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     @EncryptionField
+    @DbColumn(comment = "APIv2 密钥")
     private String apiKeyV2;
 
     /** 商户平台「API安全」中的 APIv3 密钥 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     @EncryptionField
+    @DbColumn(comment = "APIv3 密钥")
     private String apiKeyV3;
 
     /** APPID对应的接口密码，用于获取微信公众号jsapi支付时使用 */
     @EncryptionField
+    @DbColumn(comment = "APPID对应的接口密码")
     private String appSecret;
 
     /** API 证书中的 p12 文件存储的 id */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     @EncryptionField
+    @DbColumn(comment = "API 证书中的 p12 文件存储的 id")
     private Long p12;
 
     /** API 证书中的 cert.pem 证书 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     @BigField
     @EncryptionField
+    @DbColumn(comment = "API 证书中的 cert.pem 证书 ")
     private String certPem;
 
     /** API 证书中的 key.pem 私钥 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     @BigField
     @EncryptionField
+    @DbColumn(comment = "API 证书中的 key.pem 私钥")
     private String keyPem;
 
     /** 应用域名，回调中会使用此参数 */
+    @DbColumn(comment = "应用域名")
     private String domain;
 
     /** 服务器异步通知页面路径 通知url必须为直接可访问的url，不能携带参数。公网域名必须为https */
+    @DbColumn(comment = "异步通知页面")
     private String notifyUrl;
 
     /** 页面跳转同步通知页面路径 */
+    @DbColumn(comment = "同步通知页面")
     private String returnUrl;
 
     /** 是否沙箱环境 */
+    @DbColumn(comment = "是否沙箱环境")
     private boolean sandbox;
 
     /** 超时时间(分钟) */
+    @DbColumn(comment = "超时时间(分钟)")
     private Integer expireTime;
 
     /** 可用支付方式 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @DbColumn(comment = "可用支付方式")
     private String payWays;
 
     /** 是否启用 */
+    @DbColumn(comment = "是否启用")
     private Boolean activity;
 
     /** 状态 */
+    @DbColumn(comment = "状态")
     private Integer state;
 
     /** 备注 */
+    @DbColumn(comment = "备注")
     private String remark;
 
     @Override

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/entity/WeChatPayment.java

@@ -1,8 +1,8 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.entity;
+package cn.bootx.platform.daxpay.core.channel.wechat.entity;
 
 import cn.bootx.platform.common.core.function.EntityBaseFunction;
-import cn.bootx.platform.daxpay.core.paymodel.base.entity.BasePayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.convert.WeChatConvert;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.convert.WeChatConvert;
+import cn.bootx.platform.daxpay.core.channel.base.entity.BasePayment;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPaymentDto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCallbackService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.redis.RedisClient;
@@ -8,8 +8,8 @@ import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode;
 import cn.bootx.platform.daxpay.core.notify.dao.PayNotifyRecordManager;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayCallbackStrategy;
 import cn.bootx.platform.daxpay.core.pay.service.PayCallbackService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.ijpay.core.enums.SignType;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayCancelService.java

@@ -1,11 +1,11 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.common.spring.exception.RetryableException;
 import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode;
 import cn.bootx.platform.daxpay.core.pay.local.AsyncRefundLocal;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.starter.file.service.FileUploadService;
 import cn.hutool.core.util.IdUtil;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayConfigService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.exception.DataNotExistException;
 import cn.bootx.platform.common.core.rest.PageResult;
@@ -6,8 +6,8 @@ import cn.bootx.platform.common.core.rest.dto.KeyValue;
 import cn.bootx.platform.common.core.rest.param.PageParam;
 import cn.bootx.platform.common.mybatisplus.util.MpUtil;
 import cn.bootx.platform.daxpay.code.paymodel.WeChatPayWay;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import cn.bootx.platform.daxpay.dto.paymodel.wechat.WeChatPayConfigDto;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.paymodel.wechat.WeChatPayConfigParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPayService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.util.LocalDateTimeUtil;
 import cn.bootx.platform.common.spring.exception.RetryableException;
@@ -11,7 +11,7 @@ import cn.bootx.platform.daxpay.core.pay.local.AsyncPayInfoLocal;
 import cn.bootx.platform.daxpay.core.pay.result.PaySyncResult;
 import cn.bootx.platform.daxpay.core.pay.service.PaySyncService;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import cn.bootx.platform.daxpay.dto.pay.AsyncPayInfo;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaySyncService.java

@@ -1,9 +1,9 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.daxpay.code.pay.PaySyncStatus;
 import cn.bootx.platform.daxpay.code.paymodel.WeChatPayCode;
 import cn.bootx.platform.daxpay.core.pay.result.PaySyncResult;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
 import com.ijpay.core.enums.SignType;
 import com.ijpay.core.kit.WxPayKit;
 import com.ijpay.wxpay.WxPayApi;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wechat/service/WeChatPaymentService.java

@@ -1,4 +1,4 @@
-package cn.bootx.platform.daxpay.core.paymodel.wechat.service;
+package cn.bootx.platform.daxpay.core.channel.wechat.service;
 
 import cn.bootx.platform.common.core.exception.BizException;
 import cn.bootx.platform.common.core.util.BigDecimalUtil;
@@ -7,8 +7,8 @@ import cn.bootx.platform.daxpay.code.pay.PayStatusCode;
 import cn.bootx.platform.daxpay.core.pay.local.AsyncPayInfoLocal;
 import cn.bootx.platform.daxpay.core.payment.entity.Payment;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
 import cn.bootx.platform.daxpay.dto.pay.AsyncPayInfo;
 import cn.bootx.platform.daxpay.dto.payment.PayChannelInfo;
 import cn.bootx.platform.daxpay.dto.payment.RefundableInfo;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/convert/MerchantInfoConvert.java

@@ -0,0 +1,22 @@
+package cn.bootx.platform.daxpay.core.merchant.convert;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
+import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto;
+import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 商户
+ * @author xxm
+ * @date 2023-05-17
+ */
+@Mapper
+public interface MerchantInfoConvert {
+    MerchantInfoConvert CONVERT = Mappers.getMapper(MerchantInfoConvert.class);
+
+    MerchantInfo convert(MerchantInfoParam in);
+
+    MerchantInfoDto convert(MerchantInfo in);
+
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoManager.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.MerchantInfoParam;
+import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
+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-17
+ */
+@Repository
+@RequiredArgsConstructor
+public class MerchantInfoManager extends BaseManager<MerchantInfoMapper, MerchantInfo> {
+
+    /**
+    * 分页
+    */
+    public Page<MerchantInfo> page(PageParam pageParam, MerchantInfoParam param) {
+        Page<MerchantInfo> mpPage = MpUtil.getMpPage(pageParam, MerchantInfo.class);
+        return this.lambdaQuery()
+                .select(this.getEntityClass(),MpUtil::excludeBigField)
+                .orderByDesc(MpIdEntity::getId)
+                .page(mpPage);
+    }
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/dao/MerchantInfoMapper.java

@@ -0,0 +1,14 @@
+package cn.bootx.platform.daxpay.core.merchant.dao;
+
+import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 商户
+ * @author xxm
+ * @date 2023-05-17
+ */
+@Mapper
+public interface MerchantInfoMapper extends BaseMapper<MerchantInfo> {
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchAppPayConfig.java

@@ -0,0 +1,44 @@
+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.mybatisplus.base.MpBaseEntity;
+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
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@FieldNameConstants
+@Accessors(chain = true)
+@DbTable(comment = "商户应用支付配置")
+@TableName(value = "pay_mch_app_config")
+public class MchAppPayConfig  extends MpBaseEntity {
+
+    @DbColumn(comment = "关联配置ID")
+    private Long configId;
+
+    /** 类型 */
+    @DbColumn(comment = "支付通道类型")
+    private String channel;
+
+    /** 类型 */
+    @DbColumn(comment = "支付通道名称")
+    private String channelName;
+
+    /** 状态 */
+    @DbColumn(comment = "状态")
+    private String state;
+
+    /** 备注 */
+    @DbColumn(comment = "备注")
+    private String remark;
+
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MchApplication.java

@@ -0,0 +1,48 @@
+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.mybatisplus.base.MpBaseEntity;
+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
+ */
+@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 {
+
+    /** 应用编码 */
+    @DbColumn(comment = "应用编码")
+    private String appNo;
+
+    /** 名称 */
+    @DbColumn(comment = "名称")
+    private String name;
+
+    /** 商户号 */
+    @DbColumn(comment = "商户号")
+    private String mchNo;
+
+    /** 状态类型 */
+    @DbColumn(comment = "状态类型")
+    private String state;
+
+    /** 备注 */
+    @DbColumn(comment = "备注")
+    private String remark;
+
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/entity/MerchantInfo.java

@@ -1,55 +1,72 @@
 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.MerchantInfoConvert;
+import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto;
+import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
 
 /**
- * 商户
+* 商户
- * @author xxm
+* @author xxm
- * @date 2023/5/15
+* @date 2023-05-17
- */
+*/
+@MySqlIndex(columns = "mch_no",type = MySqlIndexType.UNIQUE,comment = "商户号唯一索引")
 @EqualsAndHashCode(callSuper = true)
+@FieldNameConstants
 @Data
-@DbTable(comment = "商户")
-@TableName("pay_merchant")
 @Accessors(chain = true)
-public class MerchantInfo extends MpBaseEntity {
+@TableName("pay_merchant")
+public class MerchantInfo extends MpBaseEntity implements EntityBaseFunction<MerchantInfoDto> {
 
     /** 商户号 */
-    @DbColumn("商户号")
+    @DbColumn(comment = "商户号")
     private String mchNo;
 
     /** 商户名称 */
-    @DbColumn("商户名称")
+    @DbColumn(comment = "商户名称")
     private String mchName;
 
     /** 商户简称 */
-    @DbColumn("商户简称")
+    @DbColumn(comment = "商户简称")
     private String mchShortName;
 
     /** 类型 */
-    @DbColumn("类型")
+    @DbColumn(comment = "类型")
     private String type;
 
     /** 联系人姓名 */
-    @DbColumn("联系人姓名")
+    @DbColumn(comment = "联系人姓名")
     private String contactName;
 
     /** 联系人手机号 */
-    @DbColumn("联系人手机号")
+    @DbColumn(comment = "联系人手机号")
     private String contactTel;
 
-    /** 是否停用 */
+    /** 状态类型 */
-    @DbColumn("是否停用")
+    @DbColumn(comment = "状态类型")
-    private String deactivate;
+    private String state;
 
     /** 商户备注 */
-    @DbColumn("商户备注")
+    @DbColumn(comment = "商户备注")
     private String remark;
 
+    /** 创建对象 */
+    public static MerchantInfo init(MerchantInfoParam in) {
+            return MerchantInfoConvert.CONVERT.convert(in);
+    }
+
+    /** 转换成dto */
+    @Override
+    public MerchantInfoDto toDto() {
+        return MerchantInfoConvert.CONVERT.convert(this);
+    }
 }

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/merchant/service/MerchantInfoService.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.MerchantInfoManager;
+import cn.bootx.platform.daxpay.core.merchant.entity.MerchantInfo;
+import cn.bootx.platform.daxpay.dto.merchant.MerchantInfoDto;
+import cn.bootx.platform.daxpay.param.merchant.MerchantInfoParam;
+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-17
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MerchantInfoService {
+    private final MerchantInfoManager merchantInfoManager;
+
+    /**
+     * 添加
+     */
+    public void add(MerchantInfoParam param){
+        MerchantInfo merchantInfo = MerchantInfo.init(param);
+        merchantInfoManager.save(merchantInfo);
+    }
+
+    /**
+     * 修改
+     */
+    public void update(MerchantInfoParam param){
+        MerchantInfo merchantInfo = merchantInfoManager.findById(param.getId()).orElseThrow(DataNotExistException::new);
+
+        BeanUtil.copyProperties(param,merchantInfo, CopyOptions.create().ignoreNullValue());
+        merchantInfoManager.updateById(merchantInfo);
+    }
+
+    /**
+     * 分页
+     */
+    public PageResult<MerchantInfoDto> page(PageParam pageParam,MerchantInfoParam merchantInfoParam){
+        return MpUtil.convert2DtoPageResult(merchantInfoManager.page(pageParam,merchantInfoParam));
+    }
+
+    /**
+     * 获取单条
+     */
+    public MerchantInfoDto findById(Long id){
+        return merchantInfoManager.findById(id).map(MerchantInfo::toDto).orElseThrow(DataNotExistException::new);
+    }
+
+    /**
+     * 获取全部
+     */
+    public List<MerchantInfoDto> findAll(){
+        return ResultConvertUtil.dtoListConvert(merchantInfoManager.findAll());
+    }
+
+    /**
+     * 删除
+     */
+    public void delete(Long id){
+        merchantInfoManager.deleteById(id);
+    }
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/AliPayStrategy.java

@@ -9,12 +9,12 @@ import cn.bootx.platform.daxpay.core.pay.exception.ExceptionInfo;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy;
 import cn.bootx.platform.daxpay.core.pay.result.PaySyncResult;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.dao.AlipayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.alipay.dao.AlipayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.entity.AlipayConfig;
+import cn.bootx.platform.daxpay.core.channel.alipay.entity.AlipayConfig;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AliPayCancelService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayCancelService;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AliPayService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPayService;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AliPaymentService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AliPaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.alipay.service.AlipaySyncService;
+import cn.bootx.platform.daxpay.core.channel.alipay.service.AlipaySyncService;
 import cn.bootx.platform.daxpay.exception.payment.PayAmountAbnormalException;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/CashPayStrategy.java

@@ -5,7 +5,7 @@ import cn.bootx.platform.daxpay.code.pay.PayChannelCode;
 import cn.bootx.platform.daxpay.code.pay.PayChannelEnum;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.cash.service.CashService;
+import cn.bootx.platform.daxpay.core.channel.cash.service.CashService;
 import cn.bootx.platform.daxpay.exception.payment.PayAmountAbnormalException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/VoucherStrategy.java

@@ -4,9 +4,9 @@ import cn.bootx.platform.daxpay.code.pay.PayChannelCode;
 import cn.bootx.platform.daxpay.code.pay.PayChannelEnum;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.entity.Voucher;
+import cn.bootx.platform.daxpay.core.channel.voucher.entity.Voucher;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.service.VoucherPayService;
+import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPayService;
-import cn.bootx.platform.daxpay.core.paymodel.voucher.service.VoucherPaymentService;
+import cn.bootx.platform.daxpay.core.channel.voucher.service.VoucherPaymentService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Scope;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WalletPayStrategy.java

@@ -5,10 +5,10 @@ import cn.bootx.platform.daxpay.code.pay.PayChannelCode;
 import cn.bootx.platform.daxpay.code.pay.PayChannelEnum;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.entity.Wallet;
+import cn.bootx.platform.daxpay.core.channel.wallet.entity.Wallet;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletPayService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPayService;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletPaymentService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletPaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.wallet.service.WalletService;
+import cn.bootx.platform.daxpay.core.channel.wallet.service.WalletService;
 import cn.bootx.platform.daxpay.exception.waller.WalletLackOfBalanceException;
 import cn.bootx.platform.daxpay.param.pay.PayParam;
 import lombok.RequiredArgsConstructor;

dax-pay/src/main/java/cn/bootx/platform/daxpay/core/pay/strategy/WeChatPayStrategy.java

@@ -8,14 +8,14 @@ import cn.bootx.platform.daxpay.core.pay.exception.ExceptionInfo;
 import cn.bootx.platform.daxpay.core.pay.func.AbsPayStrategy;
 import cn.bootx.platform.daxpay.core.pay.result.PaySyncResult;
 import cn.bootx.platform.daxpay.core.payment.service.PaymentService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPayConfigManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPayConfigManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.dao.WeChatPaymentManager;
+import cn.bootx.platform.daxpay.core.channel.wechat.dao.WeChatPaymentManager;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayConfig;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayConfig;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.entity.WeChatPayment;
+import cn.bootx.platform.daxpay.core.channel.wechat.entity.WeChatPayment;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPayCancelService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayCancelService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPayService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPayService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPaySyncService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPaySyncService;
-import cn.bootx.platform.daxpay.core.paymodel.wechat.service.WeChatPaymentService;
+import cn.bootx.platform.daxpay.core.channel.wechat.service.WeChatPaymentService;
 import cn.bootx.platform.daxpay.exception.payment.PayAmountAbnormalException;
 import cn.bootx.platform.daxpay.exception.payment.PayFailureException;
 import cn.bootx.platform.daxpay.param.pay.PayModeParam;

dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/merchant/MerchantInfoDto.java

@@ -0,0 +1,37 @@
+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-17
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "商户")
+@Accessors(chain = true)
+public class MerchantInfoDto extends BaseDto {
+
+    @Schema(description = "商户号")
+    private String mchNo;
+    @Schema(description = "商户名称")
+    private String mchName;
+    @Schema(description = "商户简称")
+    private String mchShortName;
+    @Schema(description = "类型")
+    private String type;
+    @Schema(description = "联系人姓名")
+    private String contactName;
+    @Schema(description = "联系人手机号")
+    private String contactTel;
+    @Schema(description = "是否停用")
+    private String deactivate;
+    @Schema(description = "商户备注")
+    private String remark;
+
+}

dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/paymodel/wechat/WeChatPayConfigDto.java

@@ -35,8 +35,8 @@ public class WeChatPayConfigDto extends BaseDto implements Serializable {
     /**
      * @see WeChatPayCode#API_V2
      */
-    @Schema(description = "api版本")
+//    @Schema(description = "api版本")
-    private String apiVersion;
+//    private String apiVersion;
 
     @Schema(description = "商户平台「API安全」中的 APIv2 密钥")
     @SensitiveInfo

dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayAmountAbnormalException.java

@@ -1,7 +1,7 @@
 package cn.bootx.platform.daxpay.exception.payment;
 
 import cn.bootx.platform.common.core.exception.FatalException;
-import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
+import cn.bootx.platform.daxpay.code.PaymentErrorCode;
 
 /**
  * 异常金额
@@ -12,11 +12,11 @@ import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
 public class PayAmountAbnormalException extends FatalException {
 
     public PayAmountAbnormalException(String msg) {
-        super(PaymentCenterErrorCode.PAYMENT_AMOUNT_ABNORMAL, msg);
+        super(PaymentErrorCode.PAYMENT_AMOUNT_ABNORMAL, msg);
     }
 
     public PayAmountAbnormalException() {
-        super(PaymentCenterErrorCode.PAYMENT_AMOUNT_ABNORMAL, "异常金额");
+        super(PaymentErrorCode.PAYMENT_AMOUNT_ABNORMAL, "异常金额");
     }
 
 }

dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayFailureException.java

@@ -1,7 +1,7 @@
 package cn.bootx.platform.daxpay.exception.payment;
 
 import cn.bootx.platform.common.core.exception.BizException;
-import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
+import cn.bootx.platform.daxpay.code.PaymentErrorCode;
 
 /**
  * 付款错误
@@ -12,11 +12,11 @@ import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
 public class PayFailureException extends BizException {
 
     public PayFailureException(String message) {
-        super(PaymentCenterErrorCode.PAY_FAILURE, message);
+        super(PaymentErrorCode.PAY_FAILURE, message);
     }
 
     public PayFailureException() {
-        super(PaymentCenterErrorCode.PAY_FAILURE, "支付失败");
+        super(PaymentErrorCode.PAY_FAILURE, "支付失败");
     }
 
 }

dax-pay/src/main/java/cn/bootx/platform/daxpay/exception/payment/PayHasExistedException.java

@@ -1,7 +1,7 @@
 package cn.bootx.platform.daxpay.exception.payment;
 
 import cn.bootx.platform.common.core.exception.BizException;
-import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
+import cn.bootx.platform.daxpay.code.PaymentErrorCode;
 
 /**
  * 付款已存在
@@ -12,7 +12,7 @@ import cn.bootx.platform.daxpay.code.PaymentCenterErrorCode;
 public class PayHasExistedException extends BizException {
 
     public PayHasExistedException() {
-        super(PaymentCenterErrorCode.PAYMENT_HAS_EXISTED, "付款已存在");
+        super(PaymentErrorCode.PAYMENT_HAS_EXISTED, "付款已存在");
     }
 
 }