From a3f26d427c50e9c39e69b12ed989091970cf8dd7 Mon Sep 17 00:00:00 2001 From: imyzt Date: Sat, 13 Jul 2024 12:02:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?#3319=E3=80=90=E5=BE=AE=E4=BF=A1=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E3=80=91=E5=95=86=E5=AE=B6=E8=BD=AC=E8=B4=A6=E5=88=B0?= =?UTF-8?q?=E9=9B=B6=E9=92=B1,=E6=96=B0=E5=A2=9E`batch=5Fstatus`=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/merchanttransfer/TransferCreateResult.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/merchanttransfer/TransferCreateResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/merchanttransfer/TransferCreateResult.java index f2417c4687..026eee69ff 100644 --- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/merchanttransfer/TransferCreateResult.java +++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/merchanttransfer/TransferCreateResult.java @@ -63,4 +63,15 @@ public class TransferCreateResult implements Serializable { */ @SerializedName("create_time") private String createTime; + + /** + * 批次状态 + * 说明： + * ACCEPTED:已受理。批次已受理成功，若发起批量转账的30分钟后，转账批次单仍处于该状态，可能原因是商户账户余额不足等。商户可查询账户资金流水，若该笔转账批次单的扣款已经发生，则表示批次已经进入转账中，请再次查单确认 + * PROCESSING:转账中。已开始处理批次内的转账明细单 + * FINISHED:已完成。批次内的所有转账明细单都已处理完成 + * CLOSED:已关闭。可查询具体的批次关闭原因确认 + */ + @SerializedName("batch_status") + private String batchStatus; } From c0d46be48f384a9525dec3bf5eed63f72016d05b Mon Sep 17 00:00:00 2001 From: imyzt Date: Sat, 13 Jul 2024 12:12:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?#3295=E3=80=90=E8=A7=86=E9=A2=91=E5=8F=B7?= =?UTF-8?q?=E5=B0=8F=E5=BA=97=E3=80=91=E8=A1=A5=E5=85=85=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channel/bean/order/OrderAddressInfo.java | 18 +++++++++ .../channel/bean/order/TelNumberExtInfo.java | 37 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/TelNumberExtInfo.java diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderAddressInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderAddressInfo.java index ff3e1ba332..1af5aee49e 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderAddressInfo.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderAddressInfo.java @@ -20,4 +20,22 @@ public class OrderAddressInfo extends AddressInfo { /** 虚拟发货订单联系方式(deliver_method=1时返回) */ @JsonProperty("virtual_order_tel_number") private String virtualOrderTelNumber; + + /** + * 额外的联系方式信息（虚拟号码相关），具体结构请参考TelNumberExtInfo结构体 + */ + @JsonProperty("tel_number_ext_info") + private TelNumberExtInfo telNumberExtInfo; + + /** + * 0：不使用虚拟号码，1：使用虚拟号码 + */ + @JsonProperty("use_tel_number") + private Integer useTelNumber; + + /** + * 标识当前店铺下一个唯一的用户收货地址 + */ + @JsonProperty("hash_code") + private String hashCode; } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/TelNumberExtInfo.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/TelNumberExtInfo.java new file mode 100644 index 0000000000..1d9e8b7914 --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/TelNumberExtInfo.java @@ -0,0 +1,37 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +/** + * 联系方式信息 + * + * @author imyzt + */ +@Data +public class TelNumberExtInfo { + + /** + * 脱敏手机号 + */ + @JsonProperty("real_tel_number") + private String realTelNumber; + + /** + * 完整的虚拟号码 + */ + @JsonProperty("virtual_tel_number") + private String virtualTelNumber; + + /** + * 主动兑换的虚拟号码过期时间 + */ + @JsonProperty("virtual_tel_expire_time") + private Long virtualTelExpireTime; + + /** + * 主动兑换虚拟号码次数 + */ + @JsonProperty("get_virtual_tel_cnt") + private Long getVirtualTelCnt; +}