From 1f21f14c176f2b63e3e348c3e7f10922e729543a Mon Sep 17 00:00:00 2001
From: "felord.cn" <dax@felord.cn>
Date: Mon, 25 Jan 2021 21:27:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E4=B8=AD=E7=9A=84=E5=9C=BA=E6=99=AF=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为了更加清晰的指明支付场景的类型，对H5Info中的type进行了优化，由字符串改为枚举类型

BREAKING CHANGE: 涉及到合单支付和直连支付的H5支付场景信息需要改入参的类型
---
 .../felord/payment/wechat/v3/model/Goods.java |  4 ++--
 .../payment/wechat/v3/model/H5Info.java       | 24 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java
index 1fd46f9..800188c 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/Goods.java
@@ -41,9 +41,9 @@ public class Goods {
     /**
      * 商品数量
      */
-    private int quantity;
+    private Integer quantity;
     /**
      * 商品单价
      */
-    private int unitPrice;
+    private Integer unitPrice;
 }
diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java
index ef47f41..590d640 100644
--- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java
+++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/H5Info.java
@@ -31,7 +31,7 @@ public class H5Info {
     /**
      * 场景类型
      */
-    private String type;
+    private H5SceneType type;
     /**
      * 应用名称
      */
@@ -48,4 +48,26 @@ public class H5Info {
      * Android 平台 PackageName
      */
     private String packageName;
+
+    /**
+     * H5 场景类型
+     *
+     * @author felord.cn
+     * @since 1.0.5.RELEASE
+     */
+    public enum H5SceneType {
+
+        /**
+         * IOS
+         */
+        iOS,
+        /**
+         * Android
+         */
+        Android,
+        /**
+         * Wap
+         */
+        Wap
+    }
 }