|
@@ -39,21 +39,6 @@ public class AdapayPaymentServiceImpl implements PaymentService {
|
|
|
|
|
|
@Override
|
|
|
public OrderPayRes orderPay(OrderPayReq payReq) {
|
|
|
- if (OrderStatusEnum.WAIT_PAY.equals(payReq.getOrderStatus())) {
|
|
|
- //处于待支付状态,需要调用汇付发起付款请求接口
|
|
|
- return orderPayWaitPay(payReq);
|
|
|
- } else if (OrderStatusEnum.PAYING.equals(payReq.getOrderStatus())) {
|
|
|
- //处于付款中状态,需要拉起付款接口返回信息,并且去到汇付
|
|
|
- return orderPayPaying(payReq);
|
|
|
- }
|
|
|
- OrderPayRes orderPayRes = new OrderPayRes();
|
|
|
- orderPayRes.setStatus(false);
|
|
|
- orderPayRes.setMessage("订单状态异常");
|
|
|
- return orderPayRes;
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public OrderPayRes orderPayWaitPay(OrderPayReq payReq) {
|
|
|
PaymentReq paymentReq = new PaymentReq();
|
|
|
paymentReq.setOrder_no(payReq.getOrderNo());
|
|
|
paymentReq.setPay_channel(payReq.getPayChannel().getCode());
|
|
@@ -103,15 +88,11 @@ public class AdapayPaymentServiceImpl implements PaymentService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OrderPayRes orderPayPaying(OrderPayReq payReq) {
|
|
|
+ public OrderPayRes orderContinue(OrderPayReq payReq) {
|
|
|
OrderPayRes orderPayRes = new OrderPayRes();
|
|
|
- if (OrderStatusEnum.PAYING.getCode().equals(payReq.getOrderStatus().getCode())) {
|
|
|
- orderPayRes.setPay_info(payReq.getPayInfo());
|
|
|
- orderPayRes.setPay_amt(payReq.getOrderPrice().toString());
|
|
|
- } else {
|
|
|
- orderPayRes.setStatus(false);
|
|
|
- orderPayRes.setMessage("订单不处于支付状态中");
|
|
|
- }
|
|
|
+ orderPayRes.setPay_info(payReq.getPayInfo());
|
|
|
+ orderPayRes.setPayChannel(payReq.getPayChannel().getCode());
|
|
|
+ orderPayRes.setPay_amt(payReq.getOrderPrice().setScale(2, RoundingMode.HALF_UP).toString());
|
|
|
return orderPayRes;
|
|
|
}
|
|
|
|