From 3ae5a234bc5d34ab637f3e9dbd35fa6ec2994ad1 Mon Sep 17 00:00:00 2001 From: J <393229227@qq.com> Date: Wed, 19 Jul 2023 13:14:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?#3089=E3=80=90=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E3=80=91=E6=96=B0=E5=A2=9E=E4=BB=A3=E9=87=91=E5=88=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=95=86=E6=88=B7=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=8F=B7=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxpay/bean/marketing/FavorCouponsGetResult.java | 9 +++++++++ .../wxpay/bean/marketing/FavorStocksGetResult.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java index 3b89cec05..ff4be1207 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java @@ -142,6 +142,15 @@ public class FavorCouponsGetResult implements Serializable { @SerializedName("singleitem") private Boolean singleitem; + /** + * 商户单据号 + *

+ * 商户此次发放凭据号（格式：商户id+日期+流水号），可包含英文字母，数字，|，_，*，-等内容，不允许出现其他不合法符号，商户侧需保持唯一性。 + * 示例值: 89560002019101000121 + */ + @SerializedName("out_request_no") + private String outRequestNo; + /** * 满减券信息 *

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java index b6b24f88c..294f273de 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java @@ -112,7 +112,7 @@ public class FavorStocksGetResult implements Serializable { * 示例值：100 */ @SerializedName("distributed_coupons") - private Integer distributedCoupons; + private Long distributedCoupons; /** * 是否无资金流 -- Gitee From 044eb0e938f8efc8f594a5bb7044987a46b8f560 Mon Sep 17 00:00:00 2001 From: J <393229227@qq.com> Date: Wed, 19 Jul 2023 13:14:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?:new:#3089=E3=80=90=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E3=80=91=E6=96=B0=E5=A2=9E=E4=BB=A3=E9=87=91?= =?UTF-8?q?=E5=88=B8=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=8F=B7=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxpay/bean/marketing/FavorCouponsGetResult.java | 9 +++++++++ .../wxpay/bean/marketing/FavorStocksGetResult.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java index 3b89cec05..ff4be1207 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorCouponsGetResult.java @@ -142,6 +142,15 @@ public class FavorCouponsGetResult implements Serializable { @SerializedName("singleitem") private Boolean singleitem; + /** + * 商户单据号 + *

+ * 商户此次发放凭据号（格式：商户id+日期+流水号），可包含英文字母，数字，|，_，*，-等内容，不允许出现其他不合法符号，商户侧需保持唯一性。 + * 示例值: 89560002019101000121 + */ + @SerializedName("out_request_no") + private String outRequestNo; + /** * 满减券信息 *

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java index b6b24f88c..294f273de 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksGetResult.java @@ -112,7 +112,7 @@ public class FavorStocksGetResult implements Serializable { * 示例值：100 */ @SerializedName("distributed_coupons") - private Integer distributedCoupons; + private Long distributedCoupons; /** * 是否无资金流 -- Gitee From dfbfdb59c187b23d9ba5ad598bb8a92a3c7ddd62 Mon Sep 17 00:00:00 2001 From: J <393229227@qq.com> Date: Wed, 26 Jul 2023 14:15:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?:art:=20BaseWxMaServiceImpl=E3=80=81BaseWxP?= =?UTF-8?q?ayServiceImpl=E4=B8=ADmap=E8=B5=8B=E5=88=9D=E5=A7=8B=E5=80=BC?= =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E6=9C=AA=E9=85=8D=E7=BD=AE=E6=97=B6?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java | 2 +- .../binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java index 9f3d230c8..3847b397e 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java @@ -90,7 +90,7 @@ public abstract class BaseWxMaServiceImpl implements WxMaService, RequestH private final WxMaOpenApiService wxMaOpenApiService = new WxMaOpenApiServiceImpl(this); - private Map configMap; + private Map configMap = new HashMap<>(); private int retrySleepMillis = 1000; private int maxRetryTimes = 5; diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java index 44ee40de3..694fcb768 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java @@ -128,7 +128,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService { @Getter private final BrandMerchantTransferService brandMerchantTransferService = new BrandMerchantTransferServiceImpl(this); - protected Map configMap; + protected Map configMap = new HashMap<>(); @Override public WxPayConfig getConfig() { -- Gitee From 1130ab291ad59ab25fcd1de9143207e1231af686 Mon Sep 17 00:00:00 2001 From: J <393229227@qq.com> Date: Thu, 27 Jul 2023 14:31:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?:art:=20=E5=8F=82=E6=95=B0=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=8F=8F=E8=BF=B0=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxpay/bean/marketing/FavorStocksQueryRequest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksQueryRequest.java index 8e37d2f74..8242f7cce 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksQueryRequest.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/marketing/FavorStocksQueryRequest.java @@ -73,8 +73,9 @@ public class FavorStocksQueryRequest implements Serializable { * 是否必填：否 * 类型：string[1,64] * 描述： - * 起始创建时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss.sss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.sss表示时分秒毫秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35.120+08:00表示，北京时间2015年5月20日 13点29分35秒。 - * 示例值：2015-05-20T13:29:35.120+08:00 + * 起始创建时间，起始创建时间，遵循rfc3339标准格式，格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE，yyyy-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。 + * 校验规则：get请求，参数在 url中，需要进行 url 编码传递 + * 示例值：2015-05-20T13:29:35+08:00 * */ @SerializedName(value = "create_start_time") @@ -87,8 +88,9 @@ public class FavorStocksQueryRequest implements Serializable { * 是否必填：否 * 类型：string[1,64] * 描述： - * 终止创建时间，遵循rfc3339标准格式，格式为YYYY-MM-DDTHH:mm:ss.sss+TIMEZONE，YYYY-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss.sss表示时分秒毫秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35.120+08:00表示，北京时间2015年5月20日 13点29分35秒。 - * 示例值：2015-05-20T13:29:35.120+08:00 + * 终止创建时间，遵循rfc3339标准格式，格式为yyyy-MM-DDTHH:mm:ss+TIMEZONE，yyyy-MM-DD表示年月日，T出现在字符串中，表示time元素的开头，HH:mm:ss表示时分秒，TIMEZONE表示时区（+08:00表示东八区时间，领先UTC 8小时，即北京时间）。例如：2015-05-20T13:29:35+08:00表示，北京时间2015年5月20日 13点29分35秒。 + * 校验规则：get请求，参数在 url中，需要进行 url 编码传递 + * 示例值：2015-05-20T13:29:35+08:00 * */ @SerializedName(value = "create_end_time") -- Gitee