diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java index f966cce..a3f13c5 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/CouponUseRule.java @@ -14,7 +14,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ package cn.felord.payment.wechat.v3.model; @@ -33,37 +32,78 @@ public class CouponUseRule { /** - * The Available items. + * 可核销商品编码 */ private List availableItems; /** - * The Available merchants. + * 可用商户 */ private List availableMerchants; /** - * The Combine use. + * 是否可以叠加使用 */ private Boolean combineUse; /** - * The Coupon available time. + * 券生效时间 */ private CouponAvailableTime couponAvailableTime; /** - * The Fixed normal coupon. + * 固定面额满减券使用规则 */ private FixedNormalCoupon fixedNormalCoupon; /** - * The Goods tag. + * 订单优惠标记 */ private List goodsTag; + /** + * 指定支付方式 + */ + private List limitPay; + /** + * 指定银行卡BIN + */ + private LimitCard limitCard; /** - * The Trade type. + * 支付方式,枚举值: + * + *
    + *
  • MICROAPP:小程序支付
  • + *
  • APPPAY:APP支付
  • + *
  • PPAY:免密支付
  • + *
  • CARD:刷卡支付
  • + *
  • FACE:人脸支付
  • + *
  • OTHER:其他支付
  • + *
*/ private String tradeType; + + + /** + * 指定银行卡BIN + *

+ * 限定该批次核销的指定银行卡BIN,当批次限定了指定银行卡时方可生效 + */ + @Data + public static class LimitCard { + /** + * 银行卡名称 + *

+ * 将在微信支付收银台向用户展示,最多4个中文字 + */ + private String name; + /** + * 指定卡BIN + *

+ * 使用指定卡BIN的银行卡支付方可享受优惠,按json格式 + * 特殊规则:单个卡BIN的字符长度为【6,9】,条目个数限制为【1,10】。 + * 示例值:['62123456','62123457'] + */ + private List bin; + } } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java index 0cb4748..c13f5b0 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineH5SceneInfo.java @@ -20,6 +20,7 @@ package cn.felord.payment.wechat.v3.model.combine; import cn.felord.payment.wechat.v3.model.H5Info; import lombok.Data; import lombok.EqualsAndHashCode; + /** * 合单支付 H5场景信息. * @@ -29,5 +30,8 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data public class CombineH5SceneInfo extends CombineSceneInfo { + /** + * H5 支付信息. + */ private H5Info h5Info; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineTransactionConsumeData.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineTransactionConsumeData.java index ee0ffd8..38682ce 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineTransactionConsumeData.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineTransactionConsumeData.java @@ -14,7 +14,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * */ package cn.felord.payment.wechat.v3.model.combine; @@ -36,7 +35,7 @@ import java.util.List; public class CombineTransactionConsumeData { /** - * 合单商户appid. + * 合单商户appid,即合单发起方的appid */ private String combineAppid; @@ -76,52 +75,53 @@ public class CombineTransactionConsumeData { /** - * The Amount. + * 订单金额信息 */ private CombineAmount amount; /** - * The Attach. + * 附加数据,在查询API和支付通知中原样返回,可作为自定义参数使用。 */ private String attach; /** - * The Bank type. + * 付款银行类型,参见开户银行对照表 */ private String bankType; /** - * The Mchid. + * 子单发起方商户号,必须与发起方Appid有绑定关系。(即电商平台mchid) */ private String mchid; /** - * The Out trade no. + * 子单商户侧订单号 */ private String outTradeNo; /** - * The Sub mchid. + * 二级商户商户号,由微信支付生成并下发。 + * 服务商子商户的商户号,被合单方。直连商户不用传二级商户号。 */ private String subMchid; /** - * The Success time. + * 支付完成时间 */ private String successTime; /** - * The Trade state. + * 交易状态 */ private TradeState tradeState; /** - * The Trade type. + * 交易类型 */ private TradeType tradeType; /** - * The Transaction id. + * 微信支付侧订单号 */ private String transactionId;