!221 feat(pay): 支持通过支付订单号查询支付订单

YunaiV
1 parent 490e91d0
Showing 4 changed files with 31 additions and 5 deletions
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderMapper.java
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
 package cn.iocoder.yudao.module.pay.controller.app.order;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
@@ -46,13 +47,21 @@ public class AppPayOrderController {
     @GetMapping("/get")
     @Operation(summary = "获得支付订单")
     @Parameters({
-            @Parameter(name = "id", description = "编号", required = true, example = "1024"),
+            @Parameter(name = "id", description = "编号", example = "1024"),
+            @Parameter(name = "no", description = "支付订单号", example = "Pxxx"),
             @Parameter(name = "sync", description = "是否同步", example = "true")
     })
-    public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id,
+    public CommonResult<PayOrderRespVO> getOrder(@RequestParam(value = "id", required = false) Long id,
+                                                 @RequestParam(value = "no", required = false) String no,
                                                  @RequestParam(value = "sync", required = false) Boolean sync) {
-        PayOrderDO order = payOrderService.getOrder(id);
-        if (order== null) {
+        PayOrderDO order = null;
+        if (CharSequenceUtil.isNotEmpty(no)) {
+            order = payOrderService.getOrder(no);
+        }
+        if (ObjUtil.isNull(order) && ObjUtil.isNotNull(id)) {
+            order = payOrderService.getOrder(id);
+        }
+        if (order == null) {
             return success(null);
         }
         // 重要：校验订单是否是当前用户，避免越权
@@ -65,7 +74,7 @@ public class AppPayOrderController {
         if (Boolean.TRUE.equals(sync) && PayOrderStatusEnum.isWaiting(order.getStatus())) {
             payOrderService.syncOrderQuietly(order.getId());
             // 重新查询，因为同步后，可能会有变化
-            order = payOrderService.getOrder(id);
+            order = payOrderService.getOrder(order.getId());
         }
         return success(BeanUtils.toBean(order, PayOrderRespVO.class));
     }
@@ -48,6 +48,10 @@ public interface PayOrderMapper extends BaseMapperX&lt;PayOrderDO&gt; {
                 PayOrderDO::getMerchantOrderId, merchantOrderId);
     }
+    default PayOrderDO selectByNo(String no) {
+        return selectOne(PayOrderDO::getNo, no);
+    }
+
     default int updateByIdAndStatus(Long id, Integer status, PayOrderDO update) {
         return update(update, new LambdaQueryWrapper<PayOrderDO>()
                 .eq(PayOrderDO::getId, id).eq(PayOrderDO::getStatus, status));
@@ -34,6 +34,14 @@ public interface PayOrderService {
     /**
      * 获得支付订单
      *
+     * @param no 支付订单号
+     * @return 支付订单
+     */
+    PayOrderDO getOrder(String no);
+
+    /**
+     * 获得支付订单
+     *
      * @param appId           应用编号
      * @param merchantOrderId 商户订单编号
      * @return 支付订单
@@ -80,6 +80,11 @@ public class PayOrderServiceImpl implements PayOrderService {
     }
     @Override
+    public PayOrderDO getOrder(String no) {
+        return orderMapper.selectByNo(no);
+    }
+
+    @Override
     public PayOrderDO getOrder(Long appId, String merchantOrderId) {
         return orderMapper.selectByAppIdAndMerchantOrderId(appId, merchantOrderId);
     }