From 9bed9bee688dd3d276b059a3058b5bc261caa735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Tue, 12 Sep 2023 15:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/pluss/platform/pay/ApiPayService.java | 2 +- .../platform/pay/impl/ApiPayServiceImpl.java | 15 ++++++++++----- .../controller/home/AliPayController.java | 4 ++-- .../controller/home/ApiPayController.java | 3 ++- .../controller/home/WechantController.java | 3 ++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java index c94b3fb..4ae9095 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/ApiPayService.java @@ -12,7 +12,7 @@ public interface ApiPayService { JSONObject pay(String json,String ip); - Result orderPay(String userId, String orderNumber); + Result orderPay(String userId, String orderNumber,String appId); /** * @description:退款 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java index e67be2b..c2532ce 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java @@ -652,7 +652,7 @@ public class ApiPayServiceImpl implements ApiPayService { } @Override - public Result orderPay(String userId, String orderNumber) { + public Result orderPay(String userId, String orderNumber,String appId) { if(StringUtil.isEmpty(userId)){ return ResultGenerator.genFailResult("缺失参数！"); } @@ -698,11 +698,15 @@ public class ApiPayServiceImpl implements ApiPayService { if(mercOrderNew == null){ order = oldPay(userId,orderNumber,order); } - Long cTime = order.getCreateDt().getTime(); - Long nowTime = System.currentTimeMillis(); - if(nowTime - cTime >= 1000 * 60 * 1000){ - return ResultGenerator.genFailResult("订单已超时，请重新下单！"); + + if(ObjectUtil.isNotEmpty(order)){ + Long cTime = order.getCreateDt().getTime(); + Long nowTime = System.currentTimeMillis(); + if(nowTime - cTime >= 1000 * 60 * 1000){ + return ResultGenerator.genFailResult("订单已超时，请重新下单！"); + } } + if(StringUtil.isNotEmpty(order.getPayData())){ return ResultGenerator.genSuccessResult("获取成功",JSONObject.parseObject(order.getPayData())); } @@ -730,6 +734,7 @@ public class ApiPayServiceImpl implements ApiPayService { // TODO 测试金额上线会删除 order.setConsumeFee(mercOrderNew.getActualAmt().doubleValue()); + order.setAppletsAppid(appId); JSONObject result = sxfPayService.tradePay(order, channel,merchant); diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java index eec2d07..6a3fba8 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/AliPayController.java @@ -190,7 +190,7 @@ public class AliPayController { @PostMapping("/orderPay") @ResponseBody - public Result orderPay(String authCode,String orderNumber) { + public Result orderPay(String authCode,String orderNumber,String appId) { if(StringUtil.isEmpty(authCode)){ return ResultGenerator.genFailResult("授权码信息为空"); } @@ -198,7 +198,7 @@ public class AliPayController { return ResultGenerator.genFailResult("订单号为空"); } AlipaySystemOauthTokenResponse tokenResponse = AliUtil.getAliUserIdV2(authCode, ParametersUtil.ZY_PRI, ParametersUtil.ZY_PUB, ParametersUtil.ZY_ALI_APP_ID); - return apiPayService.orderPay(tokenResponse.getUserId(),orderNumber); + return apiPayService.orderPay(tokenResponse.getUserId(),orderNumber,appId); } public static void main(String[] args) { diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java index 6501db9..4dfb14c 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/ApiPayController.java @@ -199,7 +199,8 @@ public class ApiPayController { public Result orderPay(@RequestBody JSONObject params) { String userId = params.getString("userId"); String orderNumber = params.getString("orderNumber"); - return apiPayService.orderPay(userId,orderNumber); + + return apiPayService.orderPay(userId,orderNumber,null); } public static void main(String[] args) { diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java index fdee9c0..d7aaab5 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java @@ -485,7 +485,8 @@ public class WechantController { System.out.println("openid"+openid); String orderNumber = params.getString("orderNumber"); System.out.println("orderNumber"+orderNumber); - return apiPayService.orderPay(openid,orderNumber); + String appId=params.containsKey("appId")?params.getString("appId"):null; + return apiPayService.orderPay(openid,orderNumber,appId); } @PostMapping("/getAddress")