From 0d6d92139b5ada5bceb773f09361ea5692331513 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 25 Jun 2021 16:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E5=88=A4=E5=AE=9A=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/controller/payment/CashierController.java  | 6 +++++-
 .../lili/modules/payment/kit/params/impl/OrderCashier.java  | 5 ++---
 .../lili/modules/payment/kit/params/impl/TradeCashier.java  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
index 30117fee..0ba33e91 100644
--- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java
@@ -2,6 +2,7 @@ package cn.lili.controller.payment;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
+import cn.lili.common.exception.ServiceException;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.payment.kit.CashierSupport;
 import cn.lili.modules.payment.kit.dto.PayParam;
@@ -64,8 +65,11 @@ public class CashierController {
 
         try {
             return cashierSupport.payment(paymentMethodEnum, paymentClientEnum, request, response, payParam);
+        } catch (ServiceException se) {
+            log.info("支付异常", se);
+            throw se;
         } catch (Exception e) {
-            log.error("收银台支付错误",e);
+            log.error("收银台支付错误", e);
         }
         return null;
 
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
index d99ef09b..dc0bbc56 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java
@@ -9,15 +9,14 @@ import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
 import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import cn.lili.modules.order.order.service.OrderService;
-import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.dto.PayParam;
+import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
 import cn.lili.modules.payment.kit.enums.CashierEnum;
 import cn.lili.modules.payment.kit.params.CashierExecute;
 import cn.lili.modules.payment.kit.params.dto.CashierParam;
 import cn.lili.modules.system.entity.dto.BaseSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -106,7 +105,7 @@ public class OrderCashier implements CashierExecute {
         if (payParam.getOrderType().equals(CashierEnum.ORDER.name())) {
             Order order = orderService.getBySn(payParam.getSn());
             if (order != null) {
-                return order.getPayStatus().equals(PayStatusEnum.PAID.name());
+                return PayStatusEnum.PAID.name().equals(order.getPayStatus());
             } else {
                 throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
             }
diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
index e4e20cd2..6a488b0e 100644
--- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
+++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java
@@ -113,7 +113,7 @@ public class TradeCashier implements CashierExecute {
         if (payParam.getOrderType().equals(CashierEnum.TRADE.name())) {
             Trade trade = tradeService.getBySn(payParam.getSn());
             if (trade != null) {
-                return trade.getPayStatus().equals(PayStatusEnum.PAID.name());
+                return PayStatusEnum.PAID.name().equals(trade.getPayStatus());
             } else {
                 throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
             }