diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java index 5743e277b..d345c25ef 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java @@ -370,10 +370,10 @@ public class EntryManager { // uploadParamImage(merchantDto); verifyEntryParam(merchantDto); -// uploadParamImage(merchantDto); + uploadParamImage(merchantDto); // System.out.println(merchantDto); -// entryMerchant(merchantDto, PayCst.Platform.WECHAT); - entryMerchant(merchantDto, PayCst.Platform.ALIPAY); + entryMerchant(merchantDto, PayCst.Platform.WECHAT); +// entryMerchant(merchantDto, PayCst.Platform.ALIPAY); // entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY); } diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java index a0474c4ac..bcf7d497b 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java @@ -32,6 +32,9 @@ public class AlipayConfigDto { */ private String domain; + /** + * 第三方应用 签约当面付 + */ public static AlipayConfigDto getThirdDefaultConfig() { return new AlipayConfigDto() .setAppId("2021006121646825") @@ -50,6 +53,9 @@ public class AlipayConfigDto { // .setDomain("https://openapi.alipay.com/gateway.do"); } + /** + * 直付通商户配置 + */ public static AlipayConfigDto getDefaultConfig() { // return new AlipayConfigDto() // .setAppId("2021006121646825") diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatReqUtils.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatReqUtils.java index 662ca11ad..6bf217918 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatReqUtils.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatReqUtils.java @@ -56,14 +56,14 @@ public class WechatReqUtils { HttpRequest request = switch (method) { case "POST" -> HttpUtil.createPost(configDto.getDomain() + url) .header("Authorization", authorization) - .header("Wechatpay-Serial", configDto.getSerialNumber()) + .header("Wechatpay-Serial", configDto.getPublicKeyId()) .charset(StandardCharsets.UTF_8) .contentType("application/json") .body(body ); case "GET" -> HttpUtil.createGet(configDto.getDomain() + url) .header("Authorization", authorization) - .header("Wechatpay-Serial", configDto.getSerialNumber()) + .header("Wechatpay-Serial", configDto.getPublicKeyId()) .charset(StandardCharsets.UTF_8) .contentType("application/json"); default -> throw new CzgException("不支持的请求方法");