余额支付错误的判定问题处理
This commit is contained in:
parent
f725b64345
commit
0d6d92139b
@ -2,6 +2,7 @@ package cn.lili.controller.payment;
|
|||||||
|
|
||||||
import cn.lili.common.enums.ResultCode;
|
import cn.lili.common.enums.ResultCode;
|
||||||
import cn.lili.common.enums.ResultUtil;
|
import cn.lili.common.enums.ResultUtil;
|
||||||
|
import cn.lili.common.exception.ServiceException;
|
||||||
import cn.lili.common.vo.ResultMessage;
|
import cn.lili.common.vo.ResultMessage;
|
||||||
import cn.lili.modules.payment.kit.CashierSupport;
|
import cn.lili.modules.payment.kit.CashierSupport;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
@ -64,8 +65,11 @@ public class CashierController {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
return cashierSupport.payment(paymentMethodEnum, paymentClientEnum, request, response, payParam);
|
return cashierSupport.payment(paymentMethodEnum, paymentClientEnum, request, response, payParam);
|
||||||
|
} catch (ServiceException se) {
|
||||||
|
log.info("支付异常", se);
|
||||||
|
throw se;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("收银台支付错误",e);
|
log.error("收银台支付错误", e);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
|
@ -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.enums.PayStatusEnum;
|
||||||
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
|
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
|
||||||
import cn.lili.modules.order.order.service.OrderService;
|
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.PayParam;
|
||||||
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.params.CashierExecute;
|
import cn.lili.modules.payment.kit.params.CashierExecute;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.system.entity.dto.BaseSetting;
|
import cn.lili.modules.system.entity.dto.BaseSetting;
|
||||||
import cn.lili.modules.system.entity.enums.SettingEnum;
|
import cn.lili.modules.system.entity.enums.SettingEnum;
|
||||||
import cn.lili.modules.system.service.SettingService;
|
import cn.lili.modules.system.service.SettingService;
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -106,7 +105,7 @@ public class OrderCashier implements CashierExecute {
|
|||||||
if (payParam.getOrderType().equals(CashierEnum.ORDER.name())) {
|
if (payParam.getOrderType().equals(CashierEnum.ORDER.name())) {
|
||||||
Order order = orderService.getBySn(payParam.getSn());
|
Order order = orderService.getBySn(payParam.getSn());
|
||||||
if (order != null) {
|
if (order != null) {
|
||||||
return order.getPayStatus().equals(PayStatusEnum.PAID.name());
|
return PayStatusEnum.PAID.name().equals(order.getPayStatus());
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
|
throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ public class TradeCashier implements CashierExecute {
|
|||||||
if (payParam.getOrderType().equals(CashierEnum.TRADE.name())) {
|
if (payParam.getOrderType().equals(CashierEnum.TRADE.name())) {
|
||||||
Trade trade = tradeService.getBySn(payParam.getSn());
|
Trade trade = tradeService.getBySn(payParam.getSn());
|
||||||
if (trade != null) {
|
if (trade != null) {
|
||||||
return trade.getPayStatus().equals(PayStatusEnum.PAID.name());
|
return PayStatusEnum.PAID.name().equals(trade.getPayStatus());
|
||||||
} else {
|
} else {
|
||||||
throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
|
throw new ServiceException(ResultCode.PAY_NOT_EXIST_ORDER);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user