From 9615edd882c2150384ea6292f6ac704589c9acd8 Mon Sep 17 00:00:00 2001
From: vostro2013 <vostro2013@gmail.com>
Date: Thu, 8 Jun 2023 12:36:33 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/result/CombineTransactionsResult.java        | 6 +++++-
 .../binarywang/wxpay/bean/result/enums/TradeTypeEnum.java   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java
index 2a073f6a4..34512a4d0 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java
@@ -69,6 +69,7 @@ public class CombineTransactionsResult implements Serializable {
   @Data
   @Accessors(chain = true)
   public static class JsapiResult implements Serializable {
+    private static final long serialVersionUID = -3485718620283251481L;
     private String appId;
     private String timeStamp;
     private String nonceStr;
@@ -84,6 +85,7 @@ public class CombineTransactionsResult implements Serializable {
   @Data
   @Accessors(chain = true)
   public static class AppResult implements Serializable {
+    private static final long serialVersionUID = -4462225641904225011L;
     private String appid;
     private String partnerid;
     private String prepayid;
@@ -95,6 +97,7 @@ public class CombineTransactionsResult implements Serializable {
   public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) {
     String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
     String nonceStr = SignUtils.genRandomStr();
+
     switch (tradeType) {
       case JSAPI:
         JsapiResult jsapiResult = new JsapiResult();
@@ -114,7 +117,8 @@ public class CombineTransactionsResult implements Serializable {
         return (T) appResult;
       case NATIVE:
         return (T) this.codeUrl;
+      default:
+        throw new IllegalStateException("Unexpected value: " + tradeType);
     }
-    return null;
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java
index bdc5762b5..d22b94801 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java
@@ -5,6 +5,8 @@ import lombok.Getter;
 
 /**
  * 支付方式
+ *
+ * @author thinsstar
  */
 @Getter
 @AllArgsConstructor