Merge branch 'dev/2024/0527/update-app-Y' of feifan/mall-backend-app into master

修改支付查询结果

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/order/AppPayOrderController.java

@@ -43,7 +43,7 @@ public class AppPayOrderController {
     @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
     public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
         CommonResult<PayOrderRespVO> rs =
-                success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
+                success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrderByStatus(id)));
 
 
         return rs;

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/order/PayOrderService.java

@@ -31,6 +31,14 @@ public interface PayOrderService {
      */
     PayOrderDO getOrder(Long id);
 
+    /**
+     * 获得支付订单
+     *
+     * @param id 编号
+     * @return 支付订单
+     */
+    PayOrderDO getOrderByStatus(Long id);
+
     /**
      * 获得支付订单
      *

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/order/PayOrderServiceImpl.java

@@ -77,6 +77,11 @@ public class PayOrderServiceImpl implements PayOrderService {
 
     @Override
     public PayOrderDO getOrder(Long id) {
+        return orderMapper.selectById(id);
+    }
+
+    @Override
+    public PayOrderDO getOrderByStatus(Long id) {
         //添加验证是否支付成功
         PayOrderDO payOrderDO = orderMapper.selectById(id);
         if(payOrderDO.getStatus().equals(PayOrderStatusEnum.WAITING.getStatus())){
@@ -86,8 +91,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             PayOrderExtensionDO payOrderExtensionDO = orderExtensionMapper.selectByPayId(payOrderDO.getId());
             syncOrder(payOrderExtensionDO);
         }
-
-        return  payOrderDO;
+        return orderMapper.selectById(id);
     }
 
     @Override