pay/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay synced 2026-08-10 06:46:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(result): 移除冗余的 MchTradeBaseResult 中间基类

Browse Source 
MchTradeBaseResult 仅在 MchBaseResult 基础上新增 appId/appName 两个字段,
但其 appId/appName 在所有子类中均未被实际使用: 通道商户子类实体无此字段
(MapStruct 无法填充, 恒为 null), 应用子类则重新声明了自有 appName 并使用
各自通道的 wxAppId, 导致父类字段被遮蔽成为死字段。

将 12 个通道结果子类的父类由 MchTradeBaseResult 改为 MchBaseResult,
并删除 MchTradeBaseResult 类。ChannelMerchantResult 已在上一次提交中
改为继承 MchBaseResult。
This commit is contained in:
DaxPay Dev
2026-07-16 20:10:41 +08:00
parent a8d29cc95a
commit 75e73355d0
13 changed files with 24 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/direct/AlipayDirectChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.alipay.result.direct;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "支付宝直连通道商户绑定结果")
public class AlipayDirectChannelMerchantResult extends MchTradeBaseResult {
public class AlipayDirectChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/isv/AlipayIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.alipay.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "支付宝服务商通道商户绑定结果")
public class AlipayIsvChannelMerchantResult extends MchTradeBaseResult {
public class AlipayIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/result/isv/DougongIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.dougong.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "斗拱通道商户绑定结果")
public class DougongIsvChannelMerchantResult extends MchTradeBaseResult {
public class DougongIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/result/isv/HkrtIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.hkrt.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "海科融通通道商户绑定结果")
public class HkrtIsvChannelMerchantResult extends MchTradeBaseResult {
public class HkrtIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/result/isv/HmpayIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.hmpay.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "河马付通道商户绑定结果")
public class HmpayIsvChannelMerchantResult extends MchTradeBaseResult {
public class HmpayIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/result/isv/LakalaIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.lakala.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "拉卡拉通道商户绑定结果")
public class LakalaIsvChannelMerchantResult extends MchTradeBaseResult {
public class LakalaIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/result/isv/LeshuaIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.leshua.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "乐刷通道商户绑定结果")
public class LeshuaIsvChannelMerchantResult extends MchTradeBaseResult {
public class LeshuaIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/result/isv/VbillIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.vbill.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "随行付通道商户绑定结果")
public class VbillIsvChannelMerchantResult extends MchTradeBaseResult {
public class VbillIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectAppResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.wechat.result.direct;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "微信直连商户应用")
public class WechatDirectAppResult extends MchTradeBaseResult {
public class WechatDirectAppResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.wechat.result.direct;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "微信直连通道商户绑定结果")
public class WechatDirectChannelMerchantResult extends MchTradeBaseResult {
public class WechatDirectChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvChannelMerchantResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.wechat.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "微信服务商通道商户绑定结果")
public class WechatIsvChannelMerchantResult extends MchTradeBaseResult {
public class WechatIsvChannelMerchantResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

4
daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvMchAppResult.java
View File

@@ -1,6 +1,6 @@
package cn.daxpay.open.channel.wechat.result.isv;
import cn.daxpay.open.payment.common.result.MchTradeBaseResult;
import cn.daxpay.open.payment.common.result.MchBaseResult;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
@Schema(title = "微信服务商通道商户应用")
public class WechatIsvMchAppResult extends MchTradeBaseResult {
public class WechatIsvMchAppResult extends MchBaseResult {
@Schema(description = "通道商户号")
private String channelMchNo;

24
daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/result/MchTradeBaseResult.java
View File

@@ -1,24 +0,0 @@
package cn.daxpay.open.payment.common.result;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import lombok.experimental.FieldNameConstants;
/// # 商户交易基础返回结果
///
/// 注意：此类位于 common 模块，无法添加翻译注解
@EqualsAndHashCode(callSuper = true)
@Data
@FieldNameConstants
@Accessors(chain = true)
@Schema(title = "商户交易基础返回结果")
public class MchTradeBaseResult extends MchBaseResult {
@Schema(description = "商户应用AppId")
private String appId;
@Schema(description = "商户应用名称")
private String appName;
}