diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/direct/AlipayDirectChannelMerchantResult.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/direct/AlipayDirectChannelMerchantResult.java index ca0ece10d..d253989b3 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/direct/AlipayDirectChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/direct/AlipayDirectChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/isv/AlipayIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/isv/AlipayIsvChannelMerchantResult.java index 84bc380a2..295f7f84c 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/isv/AlipayIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/result/isv/AlipayIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/result/isv/DougongIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/result/isv/DougongIsvChannelMerchantResult.java index 39496cfa2..9fe6a332b 100644 --- a/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/result/isv/DougongIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-dougong/src/main/java/cn/daxpay/open/channel/dougong/result/isv/DougongIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/result/isv/HkrtIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/result/isv/HkrtIsvChannelMerchantResult.java index 156b40659..88c075908 100644 --- a/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/result/isv/HkrtIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-hkrt/src/main/java/cn/daxpay/open/channel/hkrt/result/isv/HkrtIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/result/isv/HmpayIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/result/isv/HmpayIsvChannelMerchantResult.java index 51dd02727..56c4de804 100644 --- a/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/result/isv/HmpayIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-hmpay/src/main/java/cn/daxpay/open/channel/hmpay/result/isv/HmpayIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/result/isv/LakalaIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/result/isv/LakalaIsvChannelMerchantResult.java index b96b9530d..940080a78 100644 --- a/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/result/isv/LakalaIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-lakala/src/main/java/cn/daxpay/open/channel/lakala/result/isv/LakalaIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/result/isv/LeshuaIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/result/isv/LeshuaIsvChannelMerchantResult.java index 3ce155940..fd2291c31 100644 --- a/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/result/isv/LeshuaIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-leshua/src/main/java/cn/daxpay/open/channel/leshua/result/isv/LeshuaIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/result/isv/VbillIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/result/isv/VbillIsvChannelMerchantResult.java index 548326478..4de03f2b5 100644 --- a/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/result/isv/VbillIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-vbill/src/main/java/cn/daxpay/open/channel/vbill/result/isv/VbillIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectAppResult.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectAppResult.java index e04392be0..a0d626a4d 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectAppResult.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectAppResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectChannelMerchantResult.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectChannelMerchantResult.java index 966cebfbb..f97948f4f 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/direct/WechatDirectChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvChannelMerchantResult.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvChannelMerchantResult.java index e84f875a5..bdf97af03 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvChannelMerchantResult.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvChannelMerchantResult.java @@ -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; diff --git a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvMchAppResult.java b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvMchAppResult.java index 7d036a0f9..cb2744014 100644 --- a/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvMchAppResult.java +++ b/daxpay-channel/daxpay-channel-wechat/src/main/java/cn/daxpay/open/channel/wechat/result/isv/WechatIsvMchAppResult.java @@ -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; diff --git a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/result/MchTradeBaseResult.java b/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/result/MchTradeBaseResult.java deleted file mode 100644 index 514bc64b9..000000000 --- a/daxpay-payment/daxpay-payment-core/src/main/java/cn/daxpay/open/payment/common/result/MchTradeBaseResult.java +++ /dev/null @@ -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; -}