diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExample.java index 5f7ab833..a5c2ae77 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExample.java @@ -10,7 +10,7 @@ import com.wechat.pay.java.service.partnerpayments.app.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.app.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** AppService使用示例 */ public class AppServiceExample { diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtensionExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtensionExample.java index 70b5dc75..4c8c7049 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtensionExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtensionExample.java @@ -10,7 +10,7 @@ import com.wechat.pay.java.service.partnerpayments.app.model.PrepayWithRequestPaymentResponse; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.app.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; public class AppServiceExtensionExample { /** 商户号 */ diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/h5/H5ServiceExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/h5/H5ServiceExample.java index 8cb38f47..c8be562d 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/h5/H5ServiceExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/h5/H5ServiceExample.java @@ -10,7 +10,7 @@ import com.wechat.pay.java.service.partnerpayments.h5.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.h5.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** H5Service使用示例 */ public class H5ServiceExample { diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExample.java index 9c1aa38d..bcaf47d2 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExample.java @@ -10,7 +10,7 @@ import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** JsapiService使用示例 */ public class JsapiServiceExample { diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtensionExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtensionExample.java index f0f1a46e..2cfa9fae 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtensionExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtensionExample.java @@ -10,7 +10,7 @@ import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; public class JsapiServiceExtensionExample { diff --git a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayServiceExample.java b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayServiceExample.java index c5ca39c6..0109e0d1 100644 --- a/service/src/example/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayServiceExample.java +++ b/service/src/example/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayServiceExample.java @@ -5,12 +5,12 @@ import com.wechat.pay.java.core.exception.HttpException; import com.wechat.pay.java.core.exception.MalformedMessageException; import com.wechat.pay.java.core.exception.ServiceException; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; import com.wechat.pay.java.service.partnerpayments.nativepay.model.CloseOrderRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.nativepay.model.Transaction; /** NativePayService使用示例 */ public class NativePayServiceExample { diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppService.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppService.java index 840a18cd..10c475ee 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppService.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppService.java @@ -37,7 +37,7 @@ import com.wechat.pay.java.service.partnerpayments.app.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.app.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** AppService服务 */ public class AppService { diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtension.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtension.java index 4cee854e..78838447 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtension.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/AppServiceExtension.java @@ -14,7 +14,7 @@ import com.wechat.pay.java.service.partnerpayments.app.model.PrepayWithRequestPaymentResponse; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.app.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.app.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; import java.time.Instant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/model/Transaction.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/model/Transaction.java deleted file mode 100644 index 9d4a58f1..00000000 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/app/model/Transaction.java +++ /dev/null @@ -1,272 +0,0 @@ -// Copyright 2021 Tencent Inc. All rights reserved. -// -// APP支付 -// -// APP支付API -// -// API version: 1.2.3 - -// Code generated by WechatPay APIv3 Generator based on [OpenAPI -// Generator](https://openapi-generator.tech); DO NOT EDIT. - -package com.wechat.pay.java.service.partnerpayments.app.model; - -import static com.wechat.pay.java.core.util.StringUtil.toIndentedString; - -import com.google.gson.annotations.SerializedName; -import com.wechat.pay.java.service.partnerpayments.model.PromotionDetail; -import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.partnerpayments.model.TransactionPayer; -import java.util.List; - -/** */ -public class Transaction { - /** amount */ - @SerializedName("amount") - private TransactionAmount amount; - - /** spAppid */ - @SerializedName("sp_appid") - private String spAppid; - - /** subAppid */ - @SerializedName("sub_appid") - private String subAppid; - - /** spMchid */ - @SerializedName("sp_mchid") - private String spMchid; - - /** subMchid */ - @SerializedName("sub_mchid") - private String subMchid; - - /** attach */ - @SerializedName("attach") - private String attach; - - /** bankType */ - @SerializedName("bank_type") - private String bankType; - - /** outTradeNo */ - @SerializedName("out_trade_no") - private String outTradeNo; - - /** payer */ - @SerializedName("payer") - private TransactionPayer payer; - - /** promotionDetail */ - @SerializedName("promotion_detail") - private List promotionDetail; - - /** successTime */ - @SerializedName("success_time") - private String successTime; - - /** tradeState */ - public enum TradeStateEnum { - @SerializedName("SUCCESS") - SUCCESS, - - @SerializedName("REFUND") - REFUND, - - @SerializedName("NOTPAY") - NOTPAY, - - @SerializedName("CLOSED") - CLOSED, - - @SerializedName("REVOKED") - REVOKED, - - @SerializedName("USERPAYING") - USERPAYING, - - @SerializedName("PAYERROR") - PAYERROR, - - @SerializedName("ACCEPT") - ACCEPT - } - - @SerializedName("trade_state") - private TradeStateEnum tradeState; - - /** tradeStateDesc */ - @SerializedName("trade_state_desc") - private String tradeStateDesc; - - /** tradeType */ - public enum TradeTypeEnum { - @SerializedName("JSAPI") - JSAPI, - - @SerializedName("NATIVE") - NATIVE, - - @SerializedName("APP") - APP, - - @SerializedName("MICROPAY") - MICROPAY, - - @SerializedName("MWEB") - MWEB, - - @SerializedName("FACEPAY") - FACEPAY - } - - @SerializedName("trade_type") - private TradeTypeEnum tradeType; - - /** transactionId */ - @SerializedName("transaction_id") - private String transactionId; - - public TransactionAmount getAmount() { - return amount; - } - - public void setAmount(TransactionAmount amount) { - this.amount = amount; - } - - public String getSpAppid() { - return spAppid; - } - - public void setSpAppid(String spAppid) { - this.spAppid = spAppid; - } - - public String getSubAppid() { - return subAppid; - } - - public void setSubAppid(String subAppid) { - this.subAppid = subAppid; - } - - public String getSpMchid() { - return spMchid; - } - - public void setSpMchid(String spMchid) { - this.spMchid = spMchid; - } - - public String getSubMchid() { - return subMchid; - } - - public void setSubMchid(String subMchid) { - this.subMchid = subMchid; - } - - public String getAttach() { - return attach; - } - - public void setAttach(String attach) { - this.attach = attach; - } - - public String getBankType() { - return bankType; - } - - public void setBankType(String bankType) { - this.bankType = bankType; - } - - public String getOutTradeNo() { - return outTradeNo; - } - - public void setOutTradeNo(String outTradeNo) { - this.outTradeNo = outTradeNo; - } - - public TransactionPayer getPayer() { - return payer; - } - - public void setPayer(TransactionPayer payer) { - this.payer = payer; - } - - public List getPromotionDetail() { - return promotionDetail; - } - - public void setPromotionDetail(List promotionDetail) { - this.promotionDetail = promotionDetail; - } - - public String getSuccessTime() { - return successTime; - } - - public void setSuccessTime(String successTime) { - this.successTime = successTime; - } - - public TradeStateEnum getTradeState() { - return tradeState; - } - - public void setTradeState(TradeStateEnum tradeState) { - this.tradeState = tradeState; - } - - public String getTradeStateDesc() { - return tradeStateDesc; - } - - public void setTradeStateDesc(String tradeStateDesc) { - this.tradeStateDesc = tradeStateDesc; - } - - public TradeTypeEnum getTradeType() { - return tradeType; - } - - public void setTradeType(TradeTypeEnum tradeType) { - this.tradeType = tradeType; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Transaction {\n"); - sb.append(" amount: ").append(toIndentedString(amount)).append("\n"); - sb.append(" spAppid: ").append(toIndentedString(spAppid)).append("\n"); - sb.append(" subAppid: ").append(toIndentedString(subAppid)).append("\n"); - sb.append(" spMchid: ").append(toIndentedString(spMchid)).append("\n"); - sb.append(" subMchid: ").append(toIndentedString(subMchid)).append("\n"); - sb.append(" attach: ").append(toIndentedString(attach)).append("\n"); - sb.append(" bankType: ").append(toIndentedString(bankType)).append("\n"); - sb.append(" outTradeNo: ").append(toIndentedString(outTradeNo)).append("\n"); - sb.append(" payer: ").append(toIndentedString(payer)).append("\n"); - sb.append(" promotionDetail: ").append(toIndentedString(promotionDetail)).append("\n"); - sb.append(" successTime: ").append(toIndentedString(successTime)).append("\n"); - sb.append(" tradeState: ").append(toIndentedString(tradeState)).append("\n"); - sb.append(" tradeStateDesc: ").append(toIndentedString(tradeStateDesc)).append("\n"); - sb.append(" tradeType: ").append(toIndentedString(tradeType)).append("\n"); - sb.append(" transactionId: ").append(toIndentedString(transactionId)).append("\n"); - sb.append("}"); - return sb.toString(); - } -} diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/H5Service.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/H5Service.java index 14c73514..faf4a6c3 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/H5Service.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/H5Service.java @@ -37,7 +37,7 @@ import com.wechat.pay.java.service.partnerpayments.h5.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.h5.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.h5.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** H5Service服务 */ public class H5Service { diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiService.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiService.java index 8bd8dbea..88d6698f 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiService.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiService.java @@ -37,7 +37,7 @@ import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; /** JsapiService服务 */ public class JsapiService { diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtension.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtension.java index b4191768..3ed529f1 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtension.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/JsapiServiceExtension.java @@ -14,7 +14,7 @@ import com.wechat.pay.java.service.partnerpayments.jsapi.model.PrepayWithRequestPaymentResponse; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.jsapi.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; import java.time.Instant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/model/Transaction.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/model/Transaction.java deleted file mode 100644 index b3499981..00000000 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/jsapi/model/Transaction.java +++ /dev/null @@ -1,272 +0,0 @@ -// Copyright 2021 Tencent Inc. All rights reserved. -// -// JSAPI支付 -// -// JSAPI支付API -// -// API version: 1.2.3 - -// Code generated by WechatPay APIv3 Generator based on [OpenAPI -// Generator](https://openapi-generator.tech); DO NOT EDIT. - -package com.wechat.pay.java.service.partnerpayments.jsapi.model; - -import static com.wechat.pay.java.core.util.StringUtil.toIndentedString; - -import com.google.gson.annotations.SerializedName; -import com.wechat.pay.java.service.partnerpayments.model.PromotionDetail; -import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.partnerpayments.model.TransactionPayer; -import java.util.List; - -/** */ -public class Transaction { - /** amount */ - @SerializedName("amount") - private TransactionAmount amount; - - /** spAppid */ - @SerializedName("sp_appid") - private String spAppid; - - /** subAppid */ - @SerializedName("sub_appid") - private String subAppid; - - /** spMchid */ - @SerializedName("sp_mchid") - private String spMchid; - - /** subMchid */ - @SerializedName("sub_mchid") - private String subMchid; - - /** attach */ - @SerializedName("attach") - private String attach; - - /** bankType */ - @SerializedName("bank_type") - private String bankType; - - /** outTradeNo */ - @SerializedName("out_trade_no") - private String outTradeNo; - - /** payer */ - @SerializedName("payer") - private TransactionPayer payer; - - /** promotionDetail */ - @SerializedName("promotion_detail") - private List promotionDetail; - - /** successTime */ - @SerializedName("success_time") - private String successTime; - - /** tradeState */ - public enum TradeStateEnum { - @SerializedName("SUCCESS") - SUCCESS, - - @SerializedName("REFUND") - REFUND, - - @SerializedName("NOTPAY") - NOTPAY, - - @SerializedName("CLOSED") - CLOSED, - - @SerializedName("REVOKED") - REVOKED, - - @SerializedName("USERPAYING") - USERPAYING, - - @SerializedName("PAYERROR") - PAYERROR, - - @SerializedName("ACCEPT") - ACCEPT - } - - @SerializedName("trade_state") - private TradeStateEnum tradeState; - - /** tradeStateDesc */ - @SerializedName("trade_state_desc") - private String tradeStateDesc; - - /** tradeType */ - public enum TradeTypeEnum { - @SerializedName("JSAPI") - JSAPI, - - @SerializedName("NATIVE") - NATIVE, - - @SerializedName("APP") - APP, - - @SerializedName("MICROPAY") - MICROPAY, - - @SerializedName("MWEB") - MWEB, - - @SerializedName("FACEPAY") - FACEPAY - } - - @SerializedName("trade_type") - private TradeTypeEnum tradeType; - - /** transactionId */ - @SerializedName("transaction_id") - private String transactionId; - - public TransactionAmount getAmount() { - return amount; - } - - public void setAmount(TransactionAmount amount) { - this.amount = amount; - } - - public String getSpAppid() { - return spAppid; - } - - public void setSpAppid(String spAppid) { - this.spAppid = spAppid; - } - - public String getSubAppid() { - return subAppid; - } - - public void setSubAppid(String subAppid) { - this.subAppid = subAppid; - } - - public String getSpMchid() { - return spMchid; - } - - public void setSpMchid(String spMchid) { - this.spMchid = spMchid; - } - - public String getSubMchid() { - return subMchid; - } - - public void setSubMchid(String subMchid) { - this.subMchid = subMchid; - } - - public String getAttach() { - return attach; - } - - public void setAttach(String attach) { - this.attach = attach; - } - - public String getBankType() { - return bankType; - } - - public void setBankType(String bankType) { - this.bankType = bankType; - } - - public String getOutTradeNo() { - return outTradeNo; - } - - public void setOutTradeNo(String outTradeNo) { - this.outTradeNo = outTradeNo; - } - - public TransactionPayer getPayer() { - return payer; - } - - public void setPayer(TransactionPayer payer) { - this.payer = payer; - } - - public List getPromotionDetail() { - return promotionDetail; - } - - public void setPromotionDetail(List promotionDetail) { - this.promotionDetail = promotionDetail; - } - - public String getSuccessTime() { - return successTime; - } - - public void setSuccessTime(String successTime) { - this.successTime = successTime; - } - - public TradeStateEnum getTradeState() { - return tradeState; - } - - public void setTradeState(TradeStateEnum tradeState) { - this.tradeState = tradeState; - } - - public String getTradeStateDesc() { - return tradeStateDesc; - } - - public void setTradeStateDesc(String tradeStateDesc) { - this.tradeStateDesc = tradeStateDesc; - } - - public TradeTypeEnum getTradeType() { - return tradeType; - } - - public void setTradeType(TradeTypeEnum tradeType) { - this.tradeType = tradeType; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Transaction {\n"); - sb.append(" amount: ").append(toIndentedString(amount)).append("\n"); - sb.append(" spAppid: ").append(toIndentedString(spAppid)).append("\n"); - sb.append(" subAppid: ").append(toIndentedString(subAppid)).append("\n"); - sb.append(" spMchid: ").append(toIndentedString(spMchid)).append("\n"); - sb.append(" subMchid: ").append(toIndentedString(subMchid)).append("\n"); - sb.append(" attach: ").append(toIndentedString(attach)).append("\n"); - sb.append(" bankType: ").append(toIndentedString(bankType)).append("\n"); - sb.append(" outTradeNo: ").append(toIndentedString(outTradeNo)).append("\n"); - sb.append(" payer: ").append(toIndentedString(payer)).append("\n"); - sb.append(" promotionDetail: ").append(toIndentedString(promotionDetail)).append("\n"); - sb.append(" successTime: ").append(toIndentedString(successTime)).append("\n"); - sb.append(" tradeState: ").append(toIndentedString(tradeState)).append("\n"); - sb.append(" tradeStateDesc: ").append(toIndentedString(tradeStateDesc)).append("\n"); - sb.append(" tradeType: ").append(toIndentedString(tradeType)).append("\n"); - sb.append(" transactionId: ").append(toIndentedString(transactionId)).append("\n"); - sb.append("}"); - return sb.toString(); - } -} diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/model/Transaction.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/model/Transaction.java similarity index 94% rename from service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/model/Transaction.java rename to service/src/main/java/com/wechat/pay/java/service/partnerpayments/model/Transaction.java index 8bab1374..3460b573 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/h5/model/Transaction.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/model/Transaction.java @@ -1,25 +1,18 @@ // Copyright 2021 Tencent Inc. All rights reserved. -// -// H5支付 -// -// H5支付API -// + // API version: 1.2.3 // Code generated by WechatPay APIv3 Generator based on [OpenAPI // Generator](https://openapi-generator.tech); DO NOT EDIT. -package com.wechat.pay.java.service.partnerpayments.h5.model; +package com.wechat.pay.java.service.partnerpayments.model; import static com.wechat.pay.java.core.util.StringUtil.toIndentedString; import com.google.gson.annotations.SerializedName; -import com.wechat.pay.java.service.partnerpayments.model.PromotionDetail; -import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.partnerpayments.model.TransactionPayer; import java.util.List; -/** */ +/** Transaction */ public class Transaction { /** amount */ @SerializedName("amount") diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayService.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayService.java index 12b94cdb..042b99c2 100644 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayService.java +++ b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/NativePayService.java @@ -32,12 +32,12 @@ import com.wechat.pay.java.core.http.MediaType; import com.wechat.pay.java.core.http.QueryParameter; import com.wechat.pay.java.core.http.RequestBody; +import com.wechat.pay.java.service.partnerpayments.model.Transaction; import com.wechat.pay.java.service.partnerpayments.nativepay.model.CloseOrderRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.PrepayResponse; import com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByIdRequest; import com.wechat.pay.java.service.partnerpayments.nativepay.model.QueryOrderByOutTradeNoRequest; -import com.wechat.pay.java.service.partnerpayments.nativepay.model.Transaction; /** NativePayService服务 */ public class NativePayService { diff --git a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/model/Transaction.java b/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/model/Transaction.java deleted file mode 100644 index 386cff0a..00000000 --- a/service/src/main/java/com/wechat/pay/java/service/partnerpayments/nativepay/model/Transaction.java +++ /dev/null @@ -1,272 +0,0 @@ -// Copyright 2021 Tencent Inc. All rights reserved. -// -// Native支付 -// -// Native支付API -// -// API version: 1.2.3 - -// Code generated by WechatPay APIv3 Generator based on [OpenAPI -// Generator](https://openapi-generator.tech); DO NOT EDIT. - -package com.wechat.pay.java.service.partnerpayments.nativepay.model; - -import static com.wechat.pay.java.core.util.StringUtil.toIndentedString; - -import com.google.gson.annotations.SerializedName; -import com.wechat.pay.java.service.partnerpayments.model.PromotionDetail; -import com.wechat.pay.java.service.partnerpayments.model.TransactionAmount; -import com.wechat.pay.java.service.partnerpayments.model.TransactionPayer; -import java.util.List; - -/** */ -public class Transaction { - /** amount */ - @SerializedName("amount") - private TransactionAmount amount; - - /** spAppid */ - @SerializedName("sp_appid") - private String spAppid; - - /** subAppid */ - @SerializedName("sub_appid") - private String subAppid; - - /** spMchid */ - @SerializedName("sp_mchid") - private String spMchid; - - /** subMchid */ - @SerializedName("sub_mchid") - private String subMchid; - - /** attach */ - @SerializedName("attach") - private String attach; - - /** bankType */ - @SerializedName("bank_type") - private String bankType; - - /** outTradeNo */ - @SerializedName("out_trade_no") - private String outTradeNo; - - /** payer */ - @SerializedName("payer") - private TransactionPayer payer; - - /** promotionDetail */ - @SerializedName("promotion_detail") - private List promotionDetail; - - /** successTime */ - @SerializedName("success_time") - private String successTime; - - /** tradeState */ - public enum TradeStateEnum { - @SerializedName("SUCCESS") - SUCCESS, - - @SerializedName("REFUND") - REFUND, - - @SerializedName("NOTPAY") - NOTPAY, - - @SerializedName("CLOSED") - CLOSED, - - @SerializedName("REVOKED") - REVOKED, - - @SerializedName("USERPAYING") - USERPAYING, - - @SerializedName("PAYERROR") - PAYERROR, - - @SerializedName("ACCEPT") - ACCEPT - } - - @SerializedName("trade_state") - private TradeStateEnum tradeState; - - /** tradeStateDesc */ - @SerializedName("trade_state_desc") - private String tradeStateDesc; - - /** tradeType */ - public enum TradeTypeEnum { - @SerializedName("JSAPI") - JSAPI, - - @SerializedName("NATIVE") - NATIVE, - - @SerializedName("APP") - APP, - - @SerializedName("MICROPAY") - MICROPAY, - - @SerializedName("MWEB") - MWEB, - - @SerializedName("FACEPAY") - FACEPAY - } - - @SerializedName("trade_type") - private TradeTypeEnum tradeType; - - /** transactionId */ - @SerializedName("transaction_id") - private String transactionId; - - public TransactionAmount getAmount() { - return amount; - } - - public void setAmount(TransactionAmount amount) { - this.amount = amount; - } - - public String getSpAppid() { - return spAppid; - } - - public void setSpAppid(String spAppid) { - this.spAppid = spAppid; - } - - public String getSubAppid() { - return subAppid; - } - - public void setSubAppid(String subAppid) { - this.subAppid = subAppid; - } - - public String getSpMchid() { - return spMchid; - } - - public void setSpMchid(String spMchid) { - this.spMchid = spMchid; - } - - public String getSubMchid() { - return subMchid; - } - - public void setSubMchid(String subMchid) { - this.subMchid = subMchid; - } - - public String getAttach() { - return attach; - } - - public void setAttach(String attach) { - this.attach = attach; - } - - public String getBankType() { - return bankType; - } - - public void setBankType(String bankType) { - this.bankType = bankType; - } - - public String getOutTradeNo() { - return outTradeNo; - } - - public void setOutTradeNo(String outTradeNo) { - this.outTradeNo = outTradeNo; - } - - public TransactionPayer getPayer() { - return payer; - } - - public void setPayer(TransactionPayer payer) { - this.payer = payer; - } - - public List getPromotionDetail() { - return promotionDetail; - } - - public void setPromotionDetail(List promotionDetail) { - this.promotionDetail = promotionDetail; - } - - public String getSuccessTime() { - return successTime; - } - - public void setSuccessTime(String successTime) { - this.successTime = successTime; - } - - public TradeStateEnum getTradeState() { - return tradeState; - } - - public void setTradeState(TradeStateEnum tradeState) { - this.tradeState = tradeState; - } - - public String getTradeStateDesc() { - return tradeStateDesc; - } - - public void setTradeStateDesc(String tradeStateDesc) { - this.tradeStateDesc = tradeStateDesc; - } - - public TradeTypeEnum getTradeType() { - return tradeType; - } - - public void setTradeType(TradeTypeEnum tradeType) { - this.tradeType = tradeType; - } - - public String getTransactionId() { - return transactionId; - } - - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class Transaction {\n"); - sb.append(" amount: ").append(toIndentedString(amount)).append("\n"); - sb.append(" spAppid: ").append(toIndentedString(spAppid)).append("\n"); - sb.append(" subAppid: ").append(toIndentedString(subAppid)).append("\n"); - sb.append(" spMchid: ").append(toIndentedString(spMchid)).append("\n"); - sb.append(" subMchid: ").append(toIndentedString(subMchid)).append("\n"); - sb.append(" attach: ").append(toIndentedString(attach)).append("\n"); - sb.append(" bankType: ").append(toIndentedString(bankType)).append("\n"); - sb.append(" outTradeNo: ").append(toIndentedString(outTradeNo)).append("\n"); - sb.append(" payer: ").append(toIndentedString(payer)).append("\n"); - sb.append(" promotionDetail: ").append(toIndentedString(promotionDetail)).append("\n"); - sb.append(" successTime: ").append(toIndentedString(successTime)).append("\n"); - sb.append(" tradeState: ").append(toIndentedString(tradeState)).append("\n"); - sb.append(" tradeStateDesc: ").append(toIndentedString(tradeStateDesc)).append("\n"); - sb.append(" tradeType: ").append(toIndentedString(tradeType)).append("\n"); - sb.append(" transactionId: ").append(toIndentedString(transactionId)).append("\n"); - sb.append("}"); - return sb.toString(); - } -}