Merge branch 'dev/2024/0715/update-admin-Y' of Harper/feifan-backend-zx-admin into master

查询支付订单信息的时候返回,并加上支付订单号

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -23,7 +23,6 @@ import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
 import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,9 +42,6 @@ import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 @Validated
 @Slf4j
 public class TradeOrderDetailController {
-
-    @Resource
-    private TradeOrderUpdateService tradeOrderUpdateService;
     @Resource
     private TradeOrderQueryService tradeOrderQueryService;
     @Resource
@@ -140,9 +136,10 @@ public class TradeOrderDetailController {
         if (payOrderDO == null){
             build.setPayStatus("未支付");
         }else {
+            build.setNo(payOrderDO.getNo());
             build.setPayStatus(payOrderDO.getStatus() == 0 ? "未支付" : "已支付");
         }
-        return success(null);
+        return success(build);
     }
 
     @GetMapping("/productInfo")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderPayVo.java

@@ -31,4 +31,7 @@ public class TradeOrderPayVo {
     @Schema(description = "备注", example = "你好,用户备注")
     private String userRemark;
 
+    @Schema(description = "支付订单号")
+    private String no;
+
 }