diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java deleted file mode 100644 index 37b22b4..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/WechatAllocationApi.java +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2; - -import cn.felord.payment.wechat.WechatPayProperties; -import cn.felord.payment.wechat.v2.model.BaseModel; -import cn.felord.payment.wechat.v2.model.allocation.*; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpMethod; - -import java.util.List; - -/** - * 微信支付分账 - *

- * - * @author felord.cn - * @since 1.0.10.RELEASE - * @deprecated since 1.0.14.RELEASE 直连使用{@link cn.felord.payment.wechat.v3.WechatProfitsharingApi}、服务商使用{@link cn.felord.payment.wechat.v3.WechatPartnerProfitsharingApi} - */ -@Slf4j -@Deprecated -public class WechatAllocationApi { - /** - * The constant MAPPER. - */ - private static final ObjectMapper MAPPER = new ObjectMapper(); - - static { - MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true) - .registerModule(new JavaTimeModule()); - } - - private final WechatV2Client wechatV2Client; - - /** - * Instantiates a new Wechat allocation api. - * - * @param wechatV2Client the wechat v 2 client - */ - public WechatAllocationApi(WechatV2Client wechatV2Client) { - this.wechatV2Client = wechatV2Client; - } - - /** - * 请求单次分账 - * - * @param profitSharingModel the profit sharing model - * @return json node - */ - @SneakyThrows - public JsonNode profitSharing(ProfitSharingModel profitSharingModel) { - ProfitSharingSModel model = new ProfitSharingSModel(); - List receivers = profitSharingModel.getReceivers(); - model.setReceivers(MAPPER.writeValueAsString(receivers)); - - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - model.setAppid(v3.getAppId()); - model.setMchId(v3.getMchId()); - - model.setTransactionId(profitSharingModel.getTransactionId()); - model.setOutOrderNo(profitSharingModel.getOutOrderNo()); - - model.certPath(v3.getCertPath()); - model.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(model, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/secapi/pay/profitsharing"); - } - - /** - * 请求单次分账 - * - * @param multiProfitSharingModel the multi profit sharing model - * @return json node - */ - @SneakyThrows - public JsonNode multiProfitSharing(MultiProfitSharingModel multiProfitSharingModel) { - MultiProfitSharingSModel multiProfitSharingSModel = new MultiProfitSharingSModel(); - List receivers = multiProfitSharingModel.getReceivers(); - multiProfitSharingSModel.setReceivers(MAPPER.writeValueAsString(receivers)); - - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - multiProfitSharingSModel.setAppid(v3.getAppId()); - multiProfitSharingSModel.setMchId(v3.getMchId()); - - multiProfitSharingSModel.setTransactionId(multiProfitSharingModel.getTransactionId()); - multiProfitSharingSModel.setOutOrderNo(multiProfitSharingModel.getOutOrderNo()); - - multiProfitSharingSModel.certPath(v3.getCertPath()); - multiProfitSharingSModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(multiProfitSharingSModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/secapi/pay/multiprofitsharing"); - } - - /** - * 查询分账结果 - * - * @param profitSharingQueryModel the profit sharing query model - * @return json node - */ - public JsonNode profitSharingQuery(ProfitSharingQueryModel profitSharingQueryModel) { - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingQueryModel.setMchId(v3.getMchId()); - profitSharingQueryModel.certPath(v3.getCertPath()); - profitSharingQueryModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingQueryModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/pay/profitsharingquery"); - } - - /** - * 添加分账接收方 - * - * @param profitSharingAddReceiverModel the profit sharing add receiver model - * @return json node - */ - @SneakyThrows - public JsonNode profitSharingAddReceiver(ProfitSharingAddReceiverModel profitSharingAddReceiverModel) { - ProfitSharingAddReceiverSModel profitSharingAddReceiverSModel = new ProfitSharingAddReceiverSModel(); - ProfitSharingAddReceiverModel.Receiver receiver = profitSharingAddReceiverModel.getReceiver(); - profitSharingAddReceiverSModel.setReceiver(MAPPER.writeValueAsString(receiver)); - - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingAddReceiverSModel.setAppid(v3.getAppId()); - profitSharingAddReceiverSModel.setMchId(v3.getMchId()); - - profitSharingAddReceiverSModel.certPath(v3.getCertPath()); - profitSharingAddReceiverSModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingAddReceiverSModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/pay/profitsharingaddreceiver"); - } - - /** - * 删除分账接收方 - * - * @param profitSharingRemoveReceiverModel the profit sharing remove receiver model - * @return json node - */ - @SneakyThrows - public JsonNode profitSharingRemoveReceiver(ProfitSharingRemoveReceiverModel profitSharingRemoveReceiverModel) { - ProfitSharingRemoveReceiverSModel profitSharingRemoveReceiverSModel = new ProfitSharingRemoveReceiverSModel(); - ProfitSharingRemoveReceiverModel.Receiver receiver = profitSharingRemoveReceiverModel.getReceiver(); - profitSharingRemoveReceiverSModel.setReceiver(MAPPER.writeValueAsString(receiver)); - - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingRemoveReceiverSModel.setAppid(v3.getAppId()); - profitSharingRemoveReceiverSModel.setMchId(v3.getMchId()); - - profitSharingRemoveReceiverSModel.certPath(v3.getCertPath()); - profitSharingRemoveReceiverSModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingRemoveReceiverSModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/pay/profitsharingremovereceiver"); - } - - /** - * 完结分账 - * - * @param profitSharingFinishModel the profit sharing finish model - * @return json node - */ - public JsonNode profitSharingFinish(ProfitSharingFinishModel profitSharingFinishModel) { - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingFinishModel.setAppid(v3.getAppId()); - profitSharingFinishModel.setMchId(v3.getMchId()); - profitSharingFinishModel.certPath(v3.getCertPath()); - profitSharingFinishModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingFinishModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/secapi/pay/profitsharingfinish"); - } - - /** - * 查询订单待分账金额 - * - * @param profitSharingOrderAmountQueryModel the profit sharing order amount query model - * @return json node - */ - public JsonNode profitSharingOrderAmountQuery(ProfitSharingOrderAmountQueryModel profitSharingOrderAmountQueryModel) { - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingOrderAmountQueryModel.setMchId(v3.getMchId()); - profitSharingOrderAmountQueryModel.certPath(v3.getCertPath()); - profitSharingOrderAmountQueryModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingOrderAmountQueryModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/pay/profitsharingorderamountquery"); - } - - /** - * 分账回退 - * - * @param profitSharingReturnModel the profit sharing return model - * @return json node - */ - public JsonNode profitSharingReturn(ProfitSharingReturnModel profitSharingReturnModel) { - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingReturnModel.setAppid(v3.getAppId()); - profitSharingReturnModel.setMchId(v3.getMchId()); - profitSharingReturnModel.certPath(v3.getCertPath()); - profitSharingReturnModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingReturnModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/secapi/pay/profitsharingreturn"); - } - - /** - * 回退结果查询 - * - * @param profitSharingReturnQueryModel the profit sharing return query model - * @return json node - */ - public JsonNode profitSharingReturnQuery(ProfitSharingReturnQueryModel profitSharingReturnQueryModel) { - WechatPayProperties.V3 v3 = wechatV2Client.getWechatMetaBean().getV3(); - profitSharingReturnQueryModel.setAppid(v3.getAppId()); - profitSharingReturnQueryModel.setMchId(v3.getMchId()); - profitSharingReturnQueryModel.certPath(v3.getCertPath()); - profitSharingReturnQueryModel.signType(BaseModel.HMAC_SHA256); - return wechatV2Client.wechatPayRequest(profitSharingReturnQueryModel, - HttpMethod.POST, - "https://api.mch.weixin.qq.com/pay/profitsharingreturnquery"); - } - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingModel.java deleted file mode 100644 index a95bf03..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingModel.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Base profit sharing model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class BaseProfitSharingModel extends BaseModel { - - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - private String appid; - private String transactionId; - private String outOrderNo; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingReceiverModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingReceiverModel.java deleted file mode 100644 index 7e06b52..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/BaseProfitSharingReceiverModel.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Base profit sharing receiver model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class BaseProfitSharingReceiverModel extends BaseModel { - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 公众账号ID. - *

- * 微信分配的公众账号ID - */ - private String appid; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingModel.java deleted file mode 100644 index e7744f5..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingModel.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -/** - * The type Multi profit sharing model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -public class MultiProfitSharingModel extends ProfitSharingModel { - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingSModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingSModel.java deleted file mode 100644 index 8bc26b4..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/MultiProfitSharingSModel.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -/** - * The type Multi profit sharing s model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -public class MultiProfitSharingSModel extends ProfitSharingSModel { - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverModel.java deleted file mode 100644 index f953eb5..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverModel.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing add receiver model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingAddReceiverModel extends BaseProfitSharingReceiverModel { - - private Receiver receiver; - - /** - * The type Receiver. - */ - @Data - public static class Receiver { - - /** - * 分账接收方类型. - *

- * MERCHANT_ID：商户号（mch_id或者sub_mch_id） - * PERSONAL_OPENID：个人openid - */ - private Type type; - - /** - * 分账接收方帐号. - *

- * 类型是MERCHANT_ID时，是商户号（mch_id或者sub_mch_id） - * 类型是PERSONAL_OPENID时，是个人openid - */ - private String account; - - /** - * 分账接收方全称. - *

- * 分账接收方类型是MERCHANT_ID时，是商户全称（必传），当商户是小微商户或个体户时，是开户人姓名 - * 分账接收方类型是PERSONAL_OPENID时，是个人姓名（选传，传则校验） - */ - private String name; - - /** - * 与分账方的关系类型. - *

- * 子商户与接收方的关系。 - * 本字段值为枚举： - * SERVICE_PROVIDER：服务商 - * STORE：门店 - * STAFF：员工 - * STORE_OWNER：店主 - * PARTNER：合作伙伴 - * HEADQUARTER：总部 - * BRAND：品牌方 - * DISTRIBUTOR：分销商 - * USER：用户 - * SUPPLIER：供应商 - * CUSTOM：自定义 - */ - private RelationType relationType; - - /** - * 自定义的分账关系. - *

- * 子商户与接收方具体的关系，本字段最多10个字。 - * 当字段relation_type的值为CUSTOM时，本字段必填 - * 当字段relation_type的值不为CUSTOM时，本字段无需填写 - */ - private String customRelation; - - } - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverSModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverSModel.java deleted file mode 100644 index 59679f1..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingAddReceiverSModel.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing add receiver s model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingAddReceiverSModel extends BaseProfitSharingReceiverModel { - - private String receiver; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingFinishModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingFinishModel.java deleted file mode 100644 index cab299d..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingFinishModel.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing finish model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingFinishModel extends BaseModel { - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 公众账号ID. - *

- * 微信分配的公众账号ID - */ - private String appid; - - /** - * 微信订单号. - *

- * 微信支付订单号 - */ - private String transactionId; - - /** - * 商户分账单号. - *

- * 查询分账结果，输入申请分账时的商户分账单号； 查询分账完结执行的结果，输入发起分账完结时的商户分账单号 - */ - private String outOrderNo; - - /** - * 分账完结描述. - *

- * 分账完结的原因描述 - */ - private String description; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingModel.java deleted file mode 100644 index cbdc259..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingModel.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * 单次分账请求按照传入的分账接收方账号和资金进行分账，同时会将订单剩余的待分账金额解冻给本商户。 - * 故操作成功后，订单不能再进行分账，也不能进行分账完结。 - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingModel extends BaseProfitSharingModel { - - /** - * 分账接收方列表，不超过50个json对象，不能设置分账方作为分账接受方 - */ - private List receivers; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingOrderAmountQueryModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingOrderAmountQueryModel.java deleted file mode 100644 index f2a0f45..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingOrderAmountQueryModel.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing order amount query model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingOrderAmountQueryModel extends BaseModel { - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 微信订单号. - *

- * 微信支付订单号 - */ - private String transactionId; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingQueryModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingQueryModel.java deleted file mode 100644 index c4b8a57..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingQueryModel.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing query model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingQueryModel extends BaseModel { - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 微信订单号. - *

- * 微信支付订单号 - */ - private String transactionId; - - /** - * 商户分账单号. - *

- * 查询分账结果，输入申请分账时的商户分账单号； 查询分账完结执行的结果，输入发起分账完结时的商户分账单号 - */ - private String outOrderNo; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverModel.java deleted file mode 100644 index 54c60af..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverModel.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing remove receiver model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingRemoveReceiverModel extends BaseProfitSharingReceiverModel { - - private Receiver receiver; - - /** - * The type Receiver. - */ - @Data - public static class Receiver { - - private Type type; - private String account; - - } - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverSModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverSModel.java deleted file mode 100644 index 0c5f8a1..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingRemoveReceiverSModel.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing remove receiver s model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingRemoveReceiverSModel extends BaseProfitSharingReceiverModel { - - private String receiver; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnModel.java deleted file mode 100644 index e3f6ea5..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnModel.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing return model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingReturnModel extends BaseModel { - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 公众账号ID. - *

- * 微信分配的公众账号ID - */ - private String appid; - private String orderId; - private String outOrderNo; - private String outReturnNo; - private String returnAccountType; - private String returnAccount; - private String returnAmount; - private String description; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnQueryModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnQueryModel.java deleted file mode 100644 index 76408bc..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingReturnQueryModel.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import cn.felord.payment.wechat.v2.model.BaseModel; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing return query model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingReturnQueryModel extends BaseModel { - - /** - * 商户号. - *

- * 微信支付分配的商户号 - */ - private String mchId; - - /** - * 公众账号ID. - *

- * 微信分配的公众账号ID - */ - private String appid; - - /** - * 微信分账订单号. - *

- * 原发起分账请求时，微信返回的微信分账单号，与商户分账单号一一对应。 - * 微信分账单号与商户分账单号二选一填写 - */ - private String orderId; - - /** - * 商户分账单号. - *

- * 原发起分账请求时使用的商户系统内部的分账单号。 - * 微信分账单号与商户分账单号二选一填写 - */ - private String outOrderNo; - - /** - * 商户回退单号. - *

- * 调用回退接口提供的商户系统内部的回退单号 - */ - private String outReturnNo; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingSModel.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingSModel.java deleted file mode 100644 index 7f9f295..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/ProfitSharingSModel.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * The type Profit sharing s model. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class ProfitSharingSModel extends BaseProfitSharingModel { - - /** - * 分账接收方列表，不超过50个json对象，不能设置分账方作为分账接受方。 - */ - private String receivers; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Receiver.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Receiver.java deleted file mode 100644 index dfbd71f..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Receiver.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -import lombok.Data; - -/** - * The type Receiver. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -@Data -public class Receiver { - - /** - * 分账接收方类型. - *

- * MERCHANT_ID：商户号（mch_id或者sub_mch_id） - * PERSONAL_OPENID：个人openid - */ - private Type type; - - /** - * 分账接收方帐号. - *

- * 类型是MERCHANT_ID时，是商户号（mch_id或者sub_mch_id） - * 类型是PERSONAL_OPENID时，是个人openid - */ - private String account; - - /** - * 分账金额. - *

- * 单位为分，只能为整数，不能超过原订单支付金额及最大分账比例金额 - */ - private Integer amount; - - /** - * 分账描述. - *

- * 分账的原因描述，分账账单中需要体现 - */ - private String description; - - /** - * 分账个人接收方姓名. - *

- * 可选项，在接收方类型为个人的时可选填，若有值，会检查与 name 是否实名匹配，不匹配会拒绝分账请求. - * 1、分账接收方类型是PERSONAL_OPENID时，是个人姓名（选传，传则校验） - */ - private String name; - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/RelationType.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/RelationType.java deleted file mode 100644 index 3fc38d4..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/RelationType.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2019-2022 felord.cn - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * Website: - * https://felord.cn - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * 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.v2.model.allocation; - -/** - * The enum Relation type. - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -public enum RelationType { - - /** - * Service provider relation type. - */ - SERVICE_PROVIDER, - /** - * Store relation type. - */ - STORE, - /** - * Staff relation type. - */ - STAFF, - /** - * Store owner relation type. - */ - STORE_OWNER, - /** - * Partner relation type. - */ - PARTNER, - /** - * Headquarter relation type. - */ - HEADQUARTER, - /** - * Brand relation type. - */ - BRAND, - /** - * Distributor relation type. - */ - DISTRIBUTOR, - /** - * User relation type. - */ - USER, - /** - * Supplier relation type. - */ - SUPPLIER, - /** - * Custom relation type. - */ - CUSTOM - -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Type.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Type.java deleted file mode 100644 index 1a0b7be..0000000 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v2/model/allocation/Type.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.felord.payment.wechat.v2.model.allocation; - -/** - * The enum Type. - * - * @author wangzecheng - * @since 1.0.10.RELEASE - */ -public enum Type { - - /** - * 商户号（mch_id或者sub_mch_id） - */ - MERCHANT_ID, - - /** - * 个人openid - */ - PERSONAL_OPENID -} diff --git a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java index 8bac31e..1667235 100644 --- a/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java +++ b/payment-spring-boot-autoconfigure/src/main/java/cn/felord/payment/wechat/v3/WechatApiProvider.java @@ -18,7 +18,6 @@ */ package cn.felord.payment.wechat.v3; -import cn.felord.payment.wechat.v2.WechatAllocationApi; import cn.felord.payment.wechat.v2.WechatPayRedpackApi; import cn.felord.payment.wechat.v2.WechatPayTransfersApi; import cn.felord.payment.wechat.v2.WechatV2Client; @@ -190,23 +189,6 @@ public class WechatApiProvider { return new WechatPayTransfersApi(wechatV2Client); } - /** - * 微信支付分账，基于V2 - * - * @param tenantId the tenant id - * @return wechat allocation api - * @since 1.0.10.RELEASE - * @deprecated since 1.0.14.RELEASE 直连使用{@link WechatApiProvider#profitsharingApi(String)}、服务商使用{@link WechatApiProvider#partnerProfitsharingApi(String)} - */ - @Deprecated - public WechatAllocationApi allocationApi(String tenantId) { - WechatMetaBean wechatMeta = wechatPayClient.signatureProvider() - .wechatMetaContainer() - .getWechatMeta(tenantId); - WechatV2Client wechatV2Client = new WechatV2Client(wechatMeta); - return new WechatAllocationApi(wechatV2Client); - } - /** * 直连商户微信支付分账，基于V3 *