【功能优化】商城：查询订单详情接口，增加 sync 主动同步支付状态

YunaiV
1 parent 567cbeae
Showing 3 changed files with 45 additions and 6 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
@@ -21,6 +21,7 @@ import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
 import com.google.common.collect.Maps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
@@ -88,21 +89,32 @@ public class AppTradeOrderController {
     @GetMapping("/get-detail")
     @Operation(summary = "获得交易订单")
-    @Parameter(name = "id", description = "交易订单编号")
+    @Parameters({
+            @Parameter(name = "id", description = "交易订单编号"),
+            @Parameter(name = "sync", description = "是否同步支付状态", example = "true")
+    })
     @PreAuthenticated
-    public CommonResult<AppTradeOrderDetailRespVO> getOrder(@RequestParam("id") Long id) {
-        // 查询订单
+    public CommonResult<AppTradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id,
+                                                                  @RequestParam(value = "sync", required = false) Boolean sync) {
+        // 1.1 查询订单
         TradeOrderDO order = tradeOrderQueryService.getOrder(getLoginUserId(), id);
         if (order == null) {
             return success(null);
         }
+        // 1.2 sync 仅在等待支付
+        if (Boolean.TRUE.equals(sync)
+                && TradeOrderStatusEnum.isUnpaid(order.getStatus()) && !order.getPayStatus()) {
+            tradeOrderUpdateService.syncOrderPayStatusQuietly(order.getId(), order.getPayOrderId());
+            // 重新查询，因为同步后，可能会有变化
+            order = tradeOrderQueryService.getOrder(id);
+        }
-        // 查询订单项
+        // 2.1 查询订单项
         List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId());
-        // 查询物流公司
+        // 2.2 查询物流公司
         DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ?
                 deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null;
-        // 最终组合
+        // 2.3 最终组合
         return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
     }
@@ -50,6 +50,17 @@ public interface TradeOrderUpdateService {
     void updateOrderPaid(Long id, Long payOrderId);
     /**
+     * 同步订单的支付状态
+     *
+     * 1. Quietly 表示，即使同步失败，也不会抛出异常
+     * 2. 什么时候回出现异常？因为是主动同步，可能和支付模块的回调通知 {@link #updateOrderPaid(Long, Long)} 存在并发冲突，导致抛出异常
+     *
+     * @param id 订单编号
+     * @param payOrderId 支付订单编号
+     */
+    void syncOrderPayStatusQuietly(Long id, Long payOrderId);
+
+    /**
      * 【管理员】发货交易订单
      *
      * @param deliveryReqVO 发货请求
@@ -302,6 +302,22 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         TradeOrderLogUtils.setUserInfo(order.getUserId(), UserTypeEnum.MEMBER.getValue());
     }
+    @Override
+    public void syncOrderPayStatusQuietly(Long id, Long payOrderId) {
+        PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId);
+        if (payOrder == null) {
+            return;
+        }
+        if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) {
+            return;
+        }
+        try {
+            getSelf().updateOrderPaid(id, payOrderId);
+        } catch (Throwable e) {
+            log.warn("[syncOrderPayStatusQuietly][id({}) payOrderId({}) 同步支付状态失败]", id, payOrderId, e);
+        }
+    }
+
     /**
      * 校验支付订单的合法性
      *