From a374f41847d9ae8f33956217a8b9bad6b5e58881 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 30 Dec 2024 21:51:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controller/app/WuyouController.java | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java index 231841c2..baad5c22 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java @@ -96,51 +96,52 @@ public class WuyouController { @ApiOperation("支付订单") @GetMapping("/payOrder/{orderId}") public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId, @RequestParam(value = "payType", required = false) String payType) { - Orders order = ordersService.getById(orderId); - if (order == null) { - return Result.error("订单不存在"); - } - - if (order.getStatus() != 0) { - return Result.error("订单已支付"); - } - - PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); - if (payDetails == null) { - payDetails = new PayDetails(); - payDetails.setState(0); - payDetails.setCreateTime(sdf.format(new Date())); - payDetails.setOrderId(order.getOrdersNo()); - payDetails.setUserId(order.getUserId()); - payDetails.setMoney(order.getPayMoney().doubleValue()); - payDetails.setType(1); - payDetails.setClassify(9); - payDetails.setTradeNo(AliPayOrderUtil.createOrderId()); - payDetailsDao.insert(payDetails); - } else { - payDetails.setTradeNo(AliPayOrderUtil.createOrderId()); - payDetailsDao.updateById(payDetails); - } - - if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) { - updateOrderStatus(payDetails, order); - Map data = new HashMap<>(); - data.put("tradeNo", payDetails.getTradeNo()); - data.put("payStatus", 1); - return Result.success().put("data", data); - } - - BaseResp baseResp = WuyouPay.payOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), - request.getHeader("User-Agent"), String.format("%d-%d", order.getCourseId(), order.getCourseDetailsId()), - payType); - if (baseResp.getCode() == null) { - return Result.error(baseResp.getErrorMsg()); - } - if (baseResp.getCode() != 200) { - return Result.error(baseResp.getMsg()); - } - - return Result.success().put("data", baseResp.getData()); + return Result.error("暂无可支付渠道"); +// Orders order = ordersService.getById(orderId); +// if (order == null) { +// return Result.error("订单不存在"); +// } +// +// if (order.getStatus() != 0) { +// return Result.error("订单已支付"); +// } +// +// PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); +// if (payDetails == null) { +// payDetails = new PayDetails(); +// payDetails.setState(0); +// payDetails.setCreateTime(sdf.format(new Date())); +// payDetails.setOrderId(order.getOrdersNo()); +// payDetails.setUserId(order.getUserId()); +// payDetails.setMoney(order.getPayMoney().doubleValue()); +// payDetails.setType(1); +// payDetails.setClassify(9); +// payDetails.setTradeNo(AliPayOrderUtil.createOrderId()); +// payDetailsDao.insert(payDetails); +// } else { +// payDetails.setTradeNo(AliPayOrderUtil.createOrderId()); +// payDetailsDao.updateById(payDetails); +// } +// +// if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) { +// updateOrderStatus(payDetails, order); +// Map data = new HashMap<>(); +// data.put("tradeNo", payDetails.getTradeNo()); +// data.put("payStatus", 1); +// return Result.success().put("data", data); +// } +// +// BaseResp baseResp = WuyouPay.payOrder(payDetails.getTradeNo(), order.getPayMoney().toString(), +// request.getHeader("User-Agent"), String.format("%d-%d", order.getCourseId(), order.getCourseDetailsId()), +// payType); +// if (baseResp.getCode() == null) { +// return Result.error(baseResp.getErrorMsg()); +// } +// if (baseResp.getCode() != 200) { +// return Result.error(baseResp.getMsg()); +// } +// +// return Result.success().put("data", baseResp.getData()); } @ApiOperation("查询订单支付结果")