From ff391cabc05534ca01067b0630c832a214d74410 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 20 Oct 2023 18:53:55 +0800 Subject: [PATCH 1/5] //pay bug --- .../com/iformall/service/impl/ProductOrderPayServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java index df5ebd8..1a1c00f 100644 --- a/suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/impl/ProductOrderPayServiceImpl.java @@ -168,7 +168,7 @@ public class ProductOrderPayServiceImpl implements ProductOrderPayService { return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(), payResult.getMsg(), payResult.getData()); } } catch (Exception e) { - e.printStackTrace(); + logger.error("创建支付单异常 ",e); return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付订单异常"); } } @@ -204,7 +204,7 @@ public class ProductOrderPayServiceImpl implements ProductOrderPayService { return new ResultData(ErrorCode.PAY_ORDER_ERROR.getCode(),"支付单状态异常"); } } catch (Exception e) { - e.printStackTrace(); + logger.error("查询支付单异常 ",e); return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); } return new ResultData(); From bb15a948eea4080eb81b3896750ca35733f56d3f Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 23 Oct 2023 13:59:16 +0800 Subject: [PATCH 2/5] //pay bug --- .../pay/service/pay/ali/page/AliPagePayAdapterService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java index 11fce50..e38fbba 100644 --- a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java +++ b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java @@ -1,5 +1,6 @@ package com.iformall.service.pay.service.pay.ali.page; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; @@ -71,6 +72,7 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement request.setBizContent(bizContent.toString()); try{ AlipayTradePagePayResponse response = alipayClient.pageExecute(request); + log.info("创建支付返回{}"+ JSON.toJSONString(response)); PayAdapterResult par = new PayAdapterResult(); if(response.isSuccess()){ if("10000".equals(response.getCode())){ From 163d7c9be9bdd792c4cdc8bc7924285d47916d95 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 23 Oct 2023 15:03:27 +0800 Subject: [PATCH 3/5] //pay bug --- .../service/pay/ali/page/AliPagePayAdapterService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java index e38fbba..06bd5f9 100644 --- a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java +++ b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java @@ -63,7 +63,9 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement //电脑网站支付场景固定传值FAST_INSTANT_TRADE_PAY bizContent.put("product_code", "FAST_INSTANT_TRADE_PAY"); - bizContent.put("qr_pay_mode",1); + bizContent.put("qr_pay_mode",4); + bizContent.put("qrcode_width",300); + String after15 = DateUtils.date2String(DateUtils.getSecondsTimeAfter(15 * 60, new Date())); @@ -73,13 +75,17 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement try{ AlipayTradePagePayResponse response = alipayClient.pageExecute(request); log.info("创建支付返回{}"+ JSON.toJSONString(response)); + log.info("创建支付返回code{}"+response.getCode() ); PayAdapterResult par = new PayAdapterResult(); if(response.isSuccess()){ + if("10000".equals(response.getCode())){ par.setSuccess(true); par.setTransactionId(response.getTradeNo()); par.setData(response); + return par; } + } par.setSuccess(false); par.setMsg(response.getMsg()); From 01c021cac270617487b1cd909ce8e36e441d2489 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 23 Oct 2023 15:08:54 +0800 Subject: [PATCH 4/5] //pay bug --- .../pay/ali/page/AliPagePayAdapterService.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java index 06bd5f9..e0682d4 100644 --- a/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java +++ b/suimangService/src/main/java/com/iformall/service/pay/service/pay/ali/page/AliPagePayAdapterService.java @@ -75,16 +75,13 @@ public class AliPagePayAdapterService extends BaseAliPayAdapterService implement try{ AlipayTradePagePayResponse response = alipayClient.pageExecute(request); log.info("创建支付返回{}"+ JSON.toJSONString(response)); - log.info("创建支付返回code{}"+response.getCode() ); PayAdapterResult par = new PayAdapterResult(); if(response.isSuccess()){ - if("10000".equals(response.getCode())){ - par.setSuccess(true); - par.setTransactionId(response.getTradeNo()); - par.setData(response); - return par; - } + par.setSuccess(true); + par.setTransactionId(response.getTradeNo()); + par.setData(response); + return par; } par.setSuccess(false); From 5114353c6e01fa47e4e22dff388cb06a2f3de5a6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 23 Oct 2023 16:21:14 +0800 Subject: [PATCH 5/5] //pay bug --- .../java/com/iformall/controller/ProductOrderController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java b/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java index 7373ecf..030f2b1 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/ProductOrderController.java @@ -220,8 +220,9 @@ public class ProductOrderController extends BaseController { ResultData resultData = productOrderPayService.handleProductOrderByQuery(appinfo,payAccount,orderPay,payAdapterService); } + ProductOrder order = productOrderService.getById(orderId); - return new ResultData(orderPay); + return new ResultData(order); }