From c78200af7a371f36a2df4edffc16e06c72330fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Fri, 12 Jul 2019 22:07:55 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9D=E6=94=AF=E4=BB=98=E4=B8=8D=E7=BB=B4=E6=8A=A4=E7=A7=9F?= =?UTF-8?q?=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java | 3 +++ .../pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java | 2 +- .../pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java | 2 +- .../pigx/pay/handler/impl/AlipayWapPayOrderHandler.java | 3 +-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java index 3006bfdda..1ddae0809 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/config/PayConfigParmaInitRunner.java @@ -80,6 +80,7 @@ public class PayConfigParmaInitRunner { .build(); AliPayApiConfigKit.putApiConfig(aliPayApiConfig); + log.info("新增支付宝支付参数 {}", aliPayApiConfig); } // 微信支付 @@ -104,7 +105,9 @@ public class PayConfigParmaInitRunner { storage.setSecret(params.getStr("secret")); storage.setToken(params.getStr("token")); wxMpService.setWxMpConfigStorage(storage); + mpServiceMap.put(channel.getAppId(), wxMpService); + log.info("新增微信支付参数 {} {}", wx, wxMpService); } }); } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java index bc929d846..7eeafe680 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AbstractPayNotifyCallbakHandler.java @@ -69,7 +69,7 @@ public abstract class AbstractPayNotifyCallbakHandler implements PayNotifyCallba * @param notifyId * @param recordService */ - public void saveRecord(Map params, String result, PayNotifyRecord record, String notifyId + void saveRecord(Map params, String result, PayNotifyRecord record, String notifyId , PayNotifyRecordService recordService) { record.setNotifyId(notifyId); String orderNo = params.get(PayConstants.OUT_TRADE_NO); diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java index 35a4d2213..cf6ce8aeb 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayPayNotifyCallbackHandler.java @@ -64,7 +64,7 @@ public class AlipayPayNotifyCallbackHandler extends AbstractPayNotifyCallbakHand */ @Override public void before(Map params) { - Integer tenant = MapUtil.getInt(params, "tenant"); + Integer tenant = MapUtil.getInt(params, "passback_params"); TenantContextHolder.setTenantId(tenant); } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java index 9244c1f07..5afa48a73 100644 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/handler/impl/AlipayWapPayOrderHandler.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.pay.handler.impl; import cn.hutool.core.util.NumberUtil; -import cn.hutool.core.util.URLUtil; import cn.hutool.extra.servlet.ServletUtil; import com.alipay.api.AlipayApiException; import com.alipay.api.domain.AlipayTradeWapPayModel; @@ -95,7 +94,7 @@ public class AlipayWapPayOrderHandler extends AbstractPayOrderHandler { //分转成元 并且保留两位 model.setTotalAmount(NumberUtil.div(tradeOrder.getAmount(), "100", 2).toString()); model.setProductCode(goodsOrder.getGoodsId()); - model.setPassbackParams(URLUtil.encode(String.format("tenant=%s", TenantContextHolder.getTenantId()))); + model.setPassbackParams(String.valueOf(TenantContextHolder.getTenantId())); try { AliPayApi.wapPay(response, model, payCommonProperties.getAliPayConfig().getReturnUrl() , payCommonProperties.getAliPayConfig().getNotifyUrl());