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

修改支付查询结果

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -166,13 +166,6 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 
     // =================== Order ===================
 
-    @Resource
-    private PayOrderExtensionMapper orderExtensionMapper;
-
-    @Resource
-    private PayOrderService payOrderService;
-
-
     /**
      * add by Ben
      * 待支付订单，点支付时的新增方法

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

@@ -42,11 +42,13 @@ public class AppPayOrderController {
     @Operation(summary = "获得支付订单")
     @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
     public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
-        CommonResult<PayOrderRespVO> rs =
-                success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrderByStatus(id)));
-
-
-        return rs;
+        return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
+    }
+    @GetMapping("/getByStatus")
+    @Operation(summary = "获得支付订单")
+    @Parameter(name = "id", description = "支付订单编号", required = true, example = "1024")
+    public CommonResult<PayOrderRespVO> getOrderByStatus(@RequestParam("id") Long id) {
+        return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrderByStatus(id)));
     }
 
     @PostMapping("/submit")