diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 26725a4..ac6cbb5 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -700,7 +700,7 @@ public class OrderServiceImpl implements OrderService { orderDetailDTO.setOrderStatus(orderState); } }else if(PaymentTypeEnum.ZFB_PAY.getCode().equals(orderSubPO.getPaymentMethod())){ - AlipayQueryResponse alipayQueryResponse = payInteg.alipayOrderQuery((long)companyStoreDTO.getOperatingCompanyId(), orderSubPO.getPaymentId()); + AlipayQueryResponse alipayQueryResponse = payInteg.alipayOrderQuery(orderSubPO.getPaymentId()); if(StringUtils.equalsIgnoreCase(alipayQueryResponse.getCode(), "SUCCESS") && StringUtils.equalsIgnoreCase(alipayQueryResponse.getTradeStatus(), "TRADE_SUCCESS")){ String orderState = paySuccessOrder(orderMainPO, orderSubPO); orderDetailDTO.setOrderStatus(orderState); diff --git a/src/main/java/com/sczx/order/thirdpart/facade/PayFacade.java b/src/main/java/com/sczx/order/thirdpart/facade/PayFacade.java index e7af173..ec930e5 100644 --- a/src/main/java/com/sczx/order/thirdpart/facade/PayFacade.java +++ b/src/main/java/com/sczx/order/thirdpart/facade/PayFacade.java @@ -66,8 +66,8 @@ public interface PayFacade { /** * 查询订单接口 */ - @GetMapping("/api/alipay/query/{companyId}/{outTradeNo}") - AlipayQueryResponse alipayOrderQuery(@PathVariable Long companyId, @PathVariable String outTradeNo); + @GetMapping("/api/alipay/query/{outTradeNo}") + AlipayQueryResponse alipayOrderQuery(@PathVariable String outTradeNo); /** * 关闭订单接口 diff --git a/src/main/java/com/sczx/order/thirdpart/integration/PayInteg.java b/src/main/java/com/sczx/order/thirdpart/integration/PayInteg.java index c53fe95..f204ae6 100644 --- a/src/main/java/com/sczx/order/thirdpart/integration/PayInteg.java +++ b/src/main/java/com/sczx/order/thirdpart/integration/PayInteg.java @@ -156,9 +156,9 @@ public class PayInteg { * 查询订单接口 */ - public AlipayQueryResponse alipayOrderQuery(Long companyId, String outTradeNo){ + public AlipayQueryResponse alipayOrderQuery(String outTradeNo){ try { - AlipayQueryResponse result = payFacade.alipayOrderQuery(companyId, outTradeNo); + AlipayQueryResponse result = payFacade.alipayOrderQuery(outTradeNo); if(StringUtils.isNotBlank(result.getCode()) && "SUCCESS".equals(result.getCode())){ return result; } else {