diff --git a/docs/stackoverflow.md b/docs/stackoverflow.md index 065c0d4..7baba40 100644 --- a/docs/stackoverflow.md +++ b/docs/stackoverflow.md @@ -7,7 +7,21 @@ - 代金券制券后不能修改，所以一定要注意 - 代金券激活券和制券要有一定的间隔时间，官方说是1分钟 - 发券不需要靠微信服务号，官方的描述是错误的，有一个支持微信登录的appid就行了 -- 不要过分相信微信文档，微信文档不一定是真的，要问就问他们客服 +- 制券 返回`403`，报文`{"code":"REQUEST_BLOCKED","message":"活动未开始或已结束\n"}`检查规则是否符合： + ``` + 1.stock_name：最多可填写9个字 + 2.max_coupons_per_user：单天发放个数上限不能为0 + 3. coupon_amount：10<=coupon_amount<=100000 + 4.available_time_after_receive：可用时间：相对时间，按分钟设置，是否1min<=分钟范围<=1440min + 5.transaction_minimum校验规则： + a、使用门槛-券面额>=0.01（门槛要大于面额） + b、0.1元<=门槛<=100000 + 6.stock_type：目前只支持NORMAL + 7.out_request_no：校验规则：不可以重复 + 8.活动时间不可以大于90天 + ``` + +!> 不要过分相信微信文档，微信文档不一定是真的，要问就问他们客服 ## 支付宝 diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java index 3ba272e..c25d544 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/BankCode.java @@ -2,7 +2,7 @@ package cn.felord.payment.wechat.enumeration; /** - * The enum Bank code. + * 银行代码. * * @author felord.cn * @since 1.0.0.RELEASE @@ -10,188 +10,280 @@ package cn.felord.payment.wechat.enumeration; public enum BankCode { /** * 工商银行 + * + * @since 1.0.0.RELEASE */ - BK_1002("1002","工商银行"), + BK_1002("1002", "工商银行"), /** * 农业银行 + * + * @since 1.0.0.RELEASE */ - BK_1005("1005","农业银行"), + BK_1005("1005", "农业银行"), /** * 建设银行 + * + * @since 1.0.0.RELEASE */ - BK_1003("1003","建设银行"), + BK_1003("1003", "建设银行"), /** * 中国银行 + * + * @since 1.0.0.RELEASE */ - BK_1026("1026","中国银行"), + BK_1026("1026", "中国银行"), /** * 交通银行 + * + * @since 1.0.0.RELEASE */ - BK_1020("1020","交通银行"), + BK_1020("1020", "交通银行"), /** * 招商银行 + * + * @since 1.0.0.RELEASE */ - BK_1001("1001","招商银行"), + BK_1001("1001", "招商银行"), /** * 邮储银行 + * + * @since 1.0.0.RELEASE */ - BK_1066("1066","邮储银行"), + BK_1066("1066", "邮储银行"), /** * 民生银行 + * + * @since 1.0.0.RELEASE */ - BK_1006("1006","民生银行"), + BK_1006("1006", "民生银行"), /** * 平安银行 + * + * @since 1.0.0.RELEASE */ - BK_1010("1010","平安银行"), + BK_1010("1010", "平安银行"), /** * 中信银行 + * + * @since 1.0.0.RELEASE */ - BK_1021("1021","中信银行"), + BK_1021("1021", "中信银行"), /** * 浦发银行 + * + * @since 1.0.0.RELEASE */ - BK_1004("1004","浦发银行"), + BK_1004("1004", "浦发银行"), /** * 兴业银行 + * + * @since 1.0.0.RELEASE */ - BK_1009("1009","兴业银行"), + BK_1009("1009", "兴业银行"), /** * 光大银行 + * + * @since 1.0.0.RELEASE */ - BK_1022("1022","光大银行"), + BK_1022("1022", "光大银行"), /** * 广发银行 + * + * @since 1.0.0.RELEASE */ - BK_1027("1027","广发银行"), + BK_1027("1027", "广发银行"), /** * 华夏银行 + * + * @since 1.0.0.RELEASE */ - BK_1025("1025","华夏银行"), + BK_1025("1025", "华夏银行"), /** * 宁波银行 + * + * @since 1.0.0.RELEASE */ - BK_1056("1056","宁波银行"), + BK_1056("1056", "宁波银行"), /** * 北京银行 + * + * @since 1.0.0.RELEASE */ - BK_4836("4836","北京银行"), + BK_4836("4836", "北京银行"), /** * 上海银行 + * + * @since 1.0.0.RELEASE */ - BK_1024("1024","上海银行"), + BK_1024("1024", "上海银行"), /** * 南京银行 + * + * @since 1.0.0.RELEASE */ - BK_1054("1054","南京银行"), + BK_1054("1054", "南京银行"), /** * 长子县融汇村镇银行 + * + * @since 1.0.0.RELEASE */ - BK_4755("4755","长子县融汇村镇银行"), + BK_4755("4755", "长子县融汇村镇银行"), /** * 长沙银行 + * + * @since 1.0.0.RELEASE */ - BK_4216("4216","长沙银行"), + BK_4216("4216", "长沙银行"), /** * 浙江泰隆商业银行 + * + * @since 1.0.0.RELEASE */ - BK_4051("4051","浙江泰隆商业银行"), + BK_4051("4051", "浙江泰隆商业银行"), /** * 中原银行 + * + * @since 1.0.0.RELEASE */ - BK_4753("4753","中原银行"), + BK_4753("4753", "中原银行"), /** * 企业银行（中国） + * + * @since 1.0.0.RELEASE */ - BK_4761("4761","企业银行（中国）"), + BK_4761("4761", "企业银行（中国）"), /** * 顺德农商银行 + * + * @since 1.0.0.RELEASE */ - BK_4036("4036","顺德农商银行"), + BK_4036("4036", "顺德农商银行"), /** * 衡水银行 + * + * @since 1.0.0.RELEASE */ - BK_4752("4752","衡水银行"), + BK_4752("4752", "衡水银行"), /** * 长治银行 + * + * @since 1.0.0.RELEASE */ - BK_4756("4756","长治银行"), + BK_4756("4756", "长治银行"), /** * 大同银行 + * + * @since 1.0.0.RELEASE */ - BK_4767("4767","大同银行"), + BK_4767("4767", "大同银行"), /** * 河南省农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4115("4115","河南省农村信用社"), + BK_4115("4115", "河南省农村信用社"), /** * 宁夏黄河农村商业银行 + * + * @since 1.0.0.RELEASE */ - BK_4150("4150","宁夏黄河农村商业银行"), + BK_4150("4150", "宁夏黄河农村商业银行"), /** * 山西省农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4156("4156","山西省农村信用社"), + BK_4156("4156", "山西省农村信用社"), /** * 安徽省农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4166("4166","安徽省农村信用社"), + BK_4166("4166", "安徽省农村信用社"), /** * 甘肃省农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4157("4157","甘肃省农村信用社"), + BK_4157("4157", "甘肃省农村信用社"), /** * 天津农村商业银行 + * + * @since 1.0.0.RELEASE */ - BK_4153("4153","天津农村商业银行"), + BK_4153("4153", "天津农村商业银行"), /** * 广西壮族自治区农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4113("4113","广西壮族自治区农村信用社"), + BK_4113("4113", "广西壮族自治区农村信用社"), /** * 陕西省农村信用社 + * + * @since 1.0.0.RELEASE */ - BK_4108("4108","陕西省农村信用社"), + BK_4108("4108", "陕西省农村信用社"), /** * 深圳农村商业银行 + * + * @since 1.0.0.RELEASE */ - BK_4076("4076","深圳农村商业银行"), + BK_4076("4076", "深圳农村商业银行"), /** * 宁波鄞州农村商业银行 + * + * @since 1.0.0.RELEASE */ - BK_4052("4052","宁波鄞州农村商业银行"), + BK_4052("4052", "宁波鄞州农村商业银行"), /** * 浙江省农村信用社联合社 + * + * @since 1.0.0.RELEASE */ - BK_4764("4764","浙江省农村信用社联合社"), + BK_4764("4764", "浙江省农村信用社联合社"), /** * 江苏省农村信用社联合社 + * + * @since 1.0.0.RELEASE */ - BK_4217("4217","江苏省农村信用社联合社"), + BK_4217("4217", "江苏省农村信用社联合社"), /** * 江苏紫金农村商业银行股份有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4072("4072","江苏紫金农村商业银行"), + BK_4072("4072", "江苏紫金农村商业银行"), /** * 北京中关村银行股份有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4769("4769","北京中关村银行"), + BK_4769("4769", "北京中关村银行"), /** * 星展银行（中国）有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4778("4778","星展银行（中国）"), + BK_4778("4778", "星展银行（中国）"), /** * 枣庄银行股份有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4766("4766","枣庄银行"), + BK_4766("4766", "枣庄银行"), /** * 海口联合农村商业银行股份有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4758("4758","海口联合农村商业银行"), + BK_4758("4758", "海口联合农村商业银行"), /** * 南洋商业银行（中国）有限公司 + * + * @since 1.0.0.RELEASE */ - BK_4763("4763","南洋商业银行（中国）"); + BK_4763("4763", "南洋商业银行（中国）"); private final String code; @@ -202,10 +294,20 @@ public enum BankCode { this.bankName = bankName; } + /** + * Code string. + * + * @return the string + */ public String code() { return this.code; } + /** + * Bank name string. + * + * @return the string + */ public String bankName() { return this.bankName; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java index 8d5128f..64fa511 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/CouponStatus.java @@ -1,22 +1,28 @@ package cn.felord.payment.wechat.enumeration; /** - * The enum Coupon status. + * 代金券状态. * * @author felord.cn * @since 1.0.0.RELEASE */ -public enum CouponStatus { +public enum CouponStatus { /** * 可用. + * + * @since 1.0.0.RELEASE */ SENDED, /** * 已实扣. + * + * @since 1.0.0.RELEASE */ USED, /** * 已过期. + * + * @since 1.0.0.RELEASE */ EXPIRED } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java index dd0b84b..a923b5f 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/StockStatus.java @@ -1,7 +1,7 @@ package cn.felord.payment.wechat.enumeration; /** - * The enum Stock status. + * 代金券批次状态. * * @author felord.cn * @since 1.0.0.RELEASE @@ -9,22 +9,32 @@ package cn.felord.payment.wechat.enumeration; public enum StockStatus { /** * Unactivated stock status. + * + * @since 1.0.0.RELEASE */ UNACTIVATED("unactivated", "未激活"), /** * Audit stock status. + * + * @since 1.0.0.RELEASE */ AUDIT("audit", "审核中"), /** * Running stock status. + * + * @since 1.0.0.RELEASE */ RUNNING("running", "运行中"), /** * Stoped stock status. + * + * @since 1.0.0.RELEASE */ STOPED("stoped", "已停止"), /** * Paused stock status. + * + * @since 1.0.0.RELEASE */ PAUSED("paused", "暂停发放"); @@ -40,6 +50,7 @@ public enum StockStatus { * Value string. * * @return the string + * @since 1.0.0.RELEASE */ public String value() { return this.value; @@ -49,6 +60,7 @@ public enum StockStatus { * Description string. * * @return the string + * @since 1.0.0.RELEASE */ public String description() { return this.description; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java index b711489..16413e9 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeState.java @@ -9,30 +9,44 @@ package cn.felord.payment.wechat.enumeration; public enum TradeState { /** * 支付成功 + * + * @since 1.0.0.RELEASE */ SUCCESS, /** * 转入退款 + * + * @since 1.0.0.RELEASE */ REFUND, /** * 未支付 + * + * @since 1.0.0.RELEASE */ NOTPAY, /** * 已关闭 + * + * @since 1.0.0.RELEASE */ CLOSED, /** * 已撤销（付款码支付） + * + * @since 1.0.0.RELEASE */ REVOKED, /** * 用户支付中（付款码支付） + * + * @since 1.0.0.RELEASE */ USERPAYING, /** * 支付失败(其他原因，如银行返回失败) + * + * @since 1.0.0.RELEASE */ PAYERROR, } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java index 5d5de55..b9ce607 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/TradeType.java @@ -9,26 +9,38 @@ package cn.felord.payment.wechat.enumeration; public enum TradeType { /** * 公众号支付 + * + * @since 1.0.0.RELEASE */ JSAPI, /** * 扫码支付 + * + * @since 1.0.0.RELEASE */ NATIVE, /** * APP支付 + * + * @since 1.0.0.RELEASE */ APP, /** * 付款码支付 + * + * @since 1.0.0.RELEASE */ MICROPAY, /** * H5支付 + * + * @since 1.0.0.RELEASE */ MWEB, /** * 刷脸支付 + * + * @since 1.0.0.RELEASE */ FACEPAY, } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java index 86b720c..9e5fd84 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WeChatServer.java @@ -10,32 +10,46 @@ package cn.felord.payment.wechat.enumeration; public enum WeChatServer { /** * 中国 + * + * @since 1.0.0.RELEASE */ CHINA("https://api.mch.weixin.qq.com"), /** * 中国国内(备用域名) + * + * @since 1.0.0.RELEASE */ CHINA2("https://api2.mch.weixin.qq.com"), /** * 香港 + * + * @since 1.0.0.RELEASE */ HK("https://apihk.mch.weixin.qq.com"), /** * 美国 + * + * @since 1.0.0.RELEASE */ US("https://apius.mch.weixin.qq.com"), /** * 获取公钥 + * + * @since 1.0.0.RELEASE */ FRAUD("https://fraud.mch.weixin.qq.com"), /** * 活动 + * + * @since 1.0.0.RELEASE */ ACTION("https://action.weixin.qq.com"); /** * 域名 + * + * @since 1.0.0.RELEASE */ private final String domain; @@ -47,6 +61,7 @@ public enum WeChatServer { * Gets type. * * @return the type + * @since 1.0.0.RELEASE */ public String domain() { return domain; diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java index 0bc9b0c..a68ae7d 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/enumeration/WechatPayV3Type.java @@ -3,148 +3,215 @@ package cn.felord.payment.wechat.enumeration; import org.springframework.http.HttpMethod; /** - * The Wechat Pay V3 type. + * 微信支付类型. * * @author felord.cn + * @see cn.felord.payment.wechat.v3.WechatPayClient * @since 1.0.0.RELEASE */ public enum WechatPayV3Type { /** * 获取证书. + * + * @since 1.0.0.RELEASE */ CERT(HttpMethod.GET, "%s/v3/certificates"), /** * 文件下载 + * + * @since 1.0.0.RELEASE */ FILE_DOWNLOAD(HttpMethod.GET, "%s/v3/billdownload/file"), /** * 微信公众号支付或者小程序支付. + * + * @since 1.0.0.RELEASE */ JSAPI(HttpMethod.POST, "%s/v3/pay/transactions/jsapi"), /** * 微信扫码支付. + * + * @since 1.0.0.RELEASE */ NATIVE(HttpMethod.POST, "%s/v3/pay/transactions/native"), /** * 微信APP支付. + * + * @since 1.0.0.RELEASE */ APP(HttpMethod.POST, "%s/v3/pay/transactions/app"), /** * H5支付. + * + * @since 1.0.0.RELEASE */ MWEB(HttpMethod.POST, "%s/v3/pay/transactions/h5"), /** * 关闭订单. + * + * @since 1.0.0.RELEASE */ CLOSE(HttpMethod.POST, "%s/v3/pay/transactions/out-trade-no/{out_trade_no}/close"), /** * 微信支付订单号查询. + * + * @since 1.0.0.RELEASE */ TRANSACTION_TRANSACTION_ID(HttpMethod.GET, "%s/v3/pay/transactions/id/{transaction_id}"), /** * 商户订单号查询. + * + * @since 1.0.0.RELEASE */ TRANSACTION_OUT_TRADE_NO(HttpMethod.GET, "%s/v3/pay/transactions/out-trade-no/{out_trade_no}"), - /** * 合单下单-APP支付API. + * + * @since 1.0.0.RELEASE */ COMBINE_APP(HttpMethod.POST, "%s/v3/combine-transactions/app"), /** * 合单下单-微信公众号支付或者小程序支付. + * + * @since 1.0.0.RELEASE */ COMBINE_JSAPI(HttpMethod.POST, "%s/v3/pay/combine-transactions/jsapi"), /** * 合单下单-H5支付API. + * + * @since 1.0.0.RELEASE */ COMBINE_MWEB(HttpMethod.POST, "%s/v3/pay/combine-transactions/h5"), /** * 合单下单-Native支付API. + * + * @since 1.0.0.RELEASE */ COMBINE_NATIVE(HttpMethod.POST, "%s/v3/pay/combine-transactions/native"), /** * 合单查询订单API. + * + * @since 1.0.0.RELEASE */ COMBINE_TRANSACTION_OUT_TRADE_NO(HttpMethod.GET, "%s/v3/combine-transactions/out-trade-no/{combine_out_trade_no}"), /** * 合单关闭订单API. + * + * @since 1.0.0.RELEASE */ COMBINE_CLOSE(HttpMethod.POST, "%s/v3/combine-transactions/out-trade-no/{combine_out_trade_no}/close"), - + /** + * 查询用户授权状态API. + * + * @since 1.0.2.RELEASE + */ + PAY_SCORE_USER_SERVICE_STATE(HttpMethod.GET,"%s/v3/payscore/user-service-state?service_id={service_id}&appid={appid}&openid={openid}"), /** * 创建代金券批次API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_COUPON_STOCKS(HttpMethod.POST, "%s/v3/marketing/favor/coupon-stocks"), /** * 激活代金券批次API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_START(HttpMethod.POST, "%s/v3/marketing/favor/stocks/{stock_id}/start"), /** * 暂停代金券批次API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_PAUSE(HttpMethod.POST, "%s/v3/marketing/favor/stocks/{stock_id}/pause"), /** * 发放代金券API、根据商户号查用户的券. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_USERS_COUPONS(HttpMethod.POST, "%s/v3/marketing/favor/users/{openid}/coupons"), /** * 重启代金券API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_RESTART(HttpMethod.POST, "%s/v3/marketing/favor/stocks/{stock_id}/restart"), /** * 条件查询批次列表API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS(HttpMethod.GET, "%s/v3/marketing/favor/stocks"), /** * 查询批次详情API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_DETAIL(HttpMethod.GET, "%s/v3/marketing/favor/stocks/{stock_id}"), /** * 查询代金券详情API + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_USERS_COUPONS_DETAIL(HttpMethod.GET, "%s/v3/marketing/favor/users/{openid}/coupons/{coupon_id}"), /** * 查询代金券可用商户API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_MERCHANTS(HttpMethod.GET, "%s/v3/marketing/favor/stocks/{stock_id}/merchants"), /** * 查询代金券可用单品API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_ITEMS(HttpMethod.GET, "%s/v3/marketing/favor/stocks/{stock_id}/items"), /** * 下载批次核销明细API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_USE_FLOW(HttpMethod.GET, "%s/v3/marketing/favor/stocks/{stock_id}/use-flow"), /** * 下载批次退款明细API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_STOCKS_REFUND_FLOW(HttpMethod.GET, "%s/v3/marketing/favor/stocks/{stock_id}/refund-flow"), /** * 营销图片上传API. + * + * @since 1.0.0.RELEASE */ MARKETING_IMAGE_UPLOAD(HttpMethod.POST, "%s/v3/marketing/favor/media/image-upload"), /** * 设置核销回调通知API. + * + * @since 1.0.0.RELEASE */ MARKETING_FAVOR_CALLBACKS(HttpMethod.POST, "%s/v3/marketing/favor/callbacks"); /** * The Pattern. + * + * @since 1.0.0.RELEASE */ private final String pattern; /** * The Method. + * + * @since 1.0.0.RELEASE */ private final HttpMethod method; @@ -153,6 +220,7 @@ public enum WechatPayV3Type { * * @param method the method * @param pattern the pattern + * @since 1.0.0.RELEASE */ WechatPayV3Type(HttpMethod method, String pattern) { this.method = method; @@ -163,6 +231,7 @@ public enum WechatPayV3Type { * Method string. * * @return the string + * @since 1.0.0.RELEASE */ public HttpMethod method() { return this.method; @@ -172,6 +241,7 @@ public enum WechatPayV3Type { * Pattern string. * * @return the string + * @since 1.0.0.RELEASE */ public String pattern() { return this.pattern; @@ -183,6 +253,7 @@ public enum WechatPayV3Type { * * @param weChatServer the we chat server * @return the string + * @since 1.0.0.RELEASE */ public String uri(WeChatServer weChatServer) { return String.format(this.pattern, weChatServer.domain()); diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayScoreApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayScoreApi.java new file mode 100644 index 0000000..b4b80d9 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatPayScoreApi.java @@ -0,0 +1,20 @@ +package cn.felord.payment.wechat.v3; + +/** + * 微信支付分API. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +public class WechatPayScoreApi extends AbstractApi{ + /** + * Instantiates a new Abstract api. + * + * @param wechatPayClient the wechat pay client + * @param tenantId the tenant id + */ + public WechatPayScoreApi(WechatPayClient wechatPayClient, String tenantId) { + super(wechatPayClient, tenantId); + } + +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java index ab9e9fe..f020422 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/combine/CombineAmount.java @@ -14,12 +14,16 @@ import lombok.Data; public class CombineAmount { /** * 符合ISO 4217标准的三位字母代码，必填，人民币：CNY 。 + * + * @since 1.0.0.RELEASE */ private String currency = "CNY"; /** * 子单金额，单位为分，必填 *

* 境外场景下，标价金额要超过商户结算币种的最小单位金额，例如结算币种为美元，则标价金额必须大于1美分 + * + * @since 1.0.0.RELEASE */ private Long totalAmount; } diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java new file mode 100644 index 0000000..43a2e79 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/A.java @@ -0,0 +1,31 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + + +import lombok.Data; + +import java.util.List; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class A { + + private String appid; + private String attach; + private Location location; + private Boolean needUserConfirm; + private String notifyUrl; + private String openid; + private String outOrderNo; + private List postDiscounts; + private List postPayments; + private RiskFund riskFund; + private String serviceId; + private String serviceIntroduction; + private TimeRange timeRange; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java new file mode 100644 index 0000000..35031f2 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/Location.java @@ -0,0 +1,16 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class Location { + private String endLocation; + private String startLocation; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java new file mode 100644 index 0000000..bf42ded --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostDiscount.java @@ -0,0 +1,17 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class PostDiscount { + + private String description; + private String name; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java new file mode 100644 index 0000000..5ba3f47 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/PostPayment.java @@ -0,0 +1,20 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class PostPayment { + + private Long amount; + private Long count; + private String description; + private String name; + +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java new file mode 100644 index 0000000..6317590 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/RiskFund.java @@ -0,0 +1,18 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class RiskFund { + + private Long amount; + private String description; + private String name; +} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java new file mode 100644 index 0000000..e0947d2 --- /dev/null +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/model/payscore/TimeRange.java @@ -0,0 +1,16 @@ + +package cn.felord.payment.wechat.v3.model.payscore; + +import lombok.Data; + +/** + * 微信支付回调请求参数. + * + * @author felord.cn + * @since 1.0.2.RELEASE + */ +@Data +public class TimeRange { + private String endTime; + private String startTime; +}