From c14500077424512bfde19fd6895c1fe19ffe12f0 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 1 Nov 2018 22:42:45 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=AD=E4=B9=B0=E5=88=B8=E5=8C=85=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98][=E4=BF=AE=E5=A4=8D]:=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E4=B8=8D=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=EF=BC=8C=E5=8F=AA=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxPayOrderController.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 8dd228263..e5ab7c5a1 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -106,7 +106,17 @@ public class WxPayOrderController extends BaseController { payOrder.setPayOrderStatus(status); payOrder.setFailReason(reasonStr); try { - wxPayOrderService.handlePayOrderStatusUpdate(payOrder); + if(status.equals(EnumPayStatus.PAY_WAY_SUCCESS) && payOrderId > 0) { + // 有价券不走update, callback更新 + payOrder = wxPayOrderService.getById(payOrderId); + if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_WAY_SUCCESS)) { + return new ResultData(Result.SUCCESS, "支付状态更新成功"); + } else { + return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); + } + } else { + wxPayOrderService.handlePayOrderStatusUpdate(payOrder); + } return new ResultData(Result.SUCCESS, "支付状态更新成功"); } catch (MallinkException e) { logger.error("支付状态更新失败2: " + payOrder.toString() + ", e:" + e.getMessage());