From 4a9d54cbf4638ee268827658426091f752c7e871 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 17 Jun 2021 12:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E7=AD=94?= =?UTF-8?q?=E5=BA=94=EF=BC=8Cwap=E6=94=AF=E4=BB=983m=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B0=9D=E8=AF=95=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../payment/kit/plugin/alipay/AliPayPlugin.java | 14 +++++++++----- .../kit/plugin/wechat/model/package-info.java | 2 -- .../java/cn/lili/modules/payment/package-info.java | 5 +++++ 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/package-info.java create mode 100644 framework/src/main/java/cn/lili/modules/payment/package-info.java diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index f1ea1041..529a8b43 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java @@ -4,8 +4,8 @@ import cn.hutool.core.net.URLDecoder; import cn.hutool.core.net.URLEncoder; import cn.hutool.json.JSONUtil; import cn.lili.common.enums.ResultCode; -import cn.lili.common.exception.ServiceException; import cn.lili.common.enums.ResultUtil; +import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.SnowFlake; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.ResultMessage; @@ -67,7 +67,6 @@ public class AliPayPlugin implements Payment { @Override public ResultMessage h5pay(HttpServletRequest request, HttpServletResponse response, PayParam payParam) { - CashierParam cashierParam = cashierSupport.cashierParam(payParam); //请求订单编号 String outTradeNo = SnowFlake.getIdStr(); @@ -79,10 +78,11 @@ public class AliPayPlugin implements Payment { //回传数据 payModel.setPassbackParams(URLEncoder.createAll().encode(JSONUtil.toJsonStr(payParam), StandardCharsets.UTF_8)); //3分钟超时 - payModel.setTimeoutExpress("3m"); + payModel.setTimeoutExpress("30m"); payModel.setOutTradeNo(outTradeNo); payModel.setProductCode("QUICK_WAP_PAY"); try { + log.info("支付宝H5支付：{}", payModel); AliPayRequest.wapPay(response, payModel, callbackUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY), notifyUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY)); } catch (Exception e) { @@ -119,7 +119,9 @@ public class AliPayPlugin implements Payment { payModel.setOutTradeNo(outTradeNo); payModel.setProductCode("QUICK_MSECURITY_PAY"); + log.info("支付宝APP支付：{}", payModel); String orderInfo = AliPayRequest.appPayToResponse(payModel, notifyUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY)).getBody(); + log.info("支付宝APP支付返回内容：{}", orderInfo); return ResultUtil.data(orderInfo); } catch (AlipayApiException e) { log.error("支付宝支付异常：", e); @@ -150,8 +152,10 @@ public class AliPayPlugin implements Payment { // payModel.setStoreId("store_id"); payModel.setTimeoutExpress("3m"); payModel.setOutTradeNo(outTradeNo); - + log.info("支付宝扫码：{}", payModel); String resultStr = AliPayRequest.tradePrecreatePayToResponse(payModel, notifyUrl(apiProperties.getBuyer(), PaymentMethodEnum.ALIPAY)).getBody(); + + log.info("支付宝扫码交互返回：{}", resultStr); JSONObject jsonObject = JSONObject.parseObject(resultStr); return ResultUtil.data(jsonObject.getJSONObject("alipay_trade_precreate_response").getString("qr_code")); } catch (Exception e) { @@ -212,7 +216,7 @@ public class AliPayPlugin implements Payment { } refundLogService.save(refundLog); } catch (Exception e) { - log.error("支付宝退款异常",e); + log.error("支付宝退款异常", e); } } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/package-info.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/package-info.java deleted file mode 100644 index f32da037..00000000 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -package cn.lili.modules.payment.kit.plugin.wechat.model; -//这个目录的很多类的属性都是下划线分割，不符合本产品的驼峰类型约定，后续会进行处理 \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/payment/package-info.java b/framework/src/main/java/cn/lili/modules/payment/package-info.java new file mode 100644 index 00000000..81001980 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/payment/package-info.java @@ -0,0 +1,5 @@ +/** + * 项目部分参考 IJPay + * git地址 https://gitee.com/javen205/IJPay + */ +package cn.lili.modules.payment; \ No newline at end of file