1.算力资源 展示字段修改、筛选条件修改

2.用户资源管理 展示字段修改、筛选条件修改
3.pdf预览接口修改

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/app/apiorder/AppApiOrderController.java

@@ -54,19 +54,17 @@ public class AppApiOrderController {
     @Operation(summary = "获得api订单分页")
     public CommonResult<PageResult<AppApiOrderRespVO>> getApiOrderPage(@Valid AppApiOrderPageReqVO pageReqVO) {
         pageReqVO.setUserId(SecurityFrameworkUtils.getLoginUser().getId());
-        PageResult<ApiOrderDO> pageResult = apiOrderService.getAppApiOrderPage(pageReqVO);
-        PageResult<AppApiOrderRespVO> appApiOrderRespVOPageResult
-                = BeanUtils.toBean(pageResult, AppApiOrderRespVO.class);
+        PageResult<AppApiOrderRespVO> pageResult = apiOrderService.getAppApiOrderPage(pageReqVO);
         //处理状态，这里一般是交给前端处理
-        List<AppApiOrderRespVO> list = appApiOrderRespVOPageResult.getList();
+        List<AppApiOrderRespVO> list = pageResult.getList();
         if (!CollectionUtil.isEmpty(list)) {
             for (AppApiOrderRespVO vo : list) {
                 vo.setStatusName(ApiOrderStatus.getRemarkByValue(vo.getStatus()));
                 vo.setInvoiceStatusName(TradeOrderInvoiceStatusEnum.getDescriptionByStatus(vo.getInvoiceStatus()));
             }
         }
-        appApiOrderRespVOPageResult.setList(list);
-        return success(appApiOrderRespVOPageResult);
+        pageResult.setList(list);
+        return success(pageResult);
     }
 /*
     @PutMapping("/update")

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/app/apiorder/vo/AppApiOrderPageReqVO.java

@@ -24,4 +24,8 @@ public class AppApiOrderPageReqVO extends PageParam {
     private Integer status;
 
 
+    @Schema(description = "api应用类型", example = "2")
+    private Long categoryId;
+
+
 }
\ No newline at end of file

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/app/apiorder/vo/AppApiOrderRespVO.java

@@ -24,6 +24,9 @@ public class AppApiOrderRespVO {
     @Schema(description = "购买的API 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "10347")
     private String apiName;
 
+    @Schema(description = "api应用类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "8957")
+    private String categoryName;
+
     @Schema(description = "购买的套餐ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8957")
     @ExcelProperty("购买的套餐ID")
     private Long packageId;

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/dal/mysql/apiorder/ApiOrderMapper.java

@@ -15,6 +15,9 @@ import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
 import com.luhu.computility.module.apihub.api.apiorder.dto.ApiOrderPageReqDTO;
 import com.luhu.computility.module.apihub.api.apiorder.dto.ApiOrderRespDTO;
 import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderPageReqVO;
+import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderRespVO;
+import com.luhu.computility.module.apihub.dal.dataobject.api.ApiDO;
+import com.luhu.computility.module.apihub.dal.dataobject.apicategory.ApiCategoryDO;
 import com.luhu.computility.module.apihub.dal.dataobject.apiorder.ApiOrderDO;
 import com.luhu.computility.module.apihub.enums.ApiOrderStatus;
 import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO;
@@ -69,14 +72,26 @@ public interface ApiOrderMapper extends BaseMapperX<ApiOrderDO> {
                 .orderByDesc(ApiOrderDO::getId));
     }
 
-    default PageResult<ApiOrderDO> selectAppPage(AppApiOrderPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ApiOrderDO>()
+    default PageResult<AppApiOrderRespVO> selectAppPage(AppApiOrderPageReqVO reqVO) {
+        return selectJoinPage(reqVO, AppApiOrderRespVO.class, new MPJLambdaWrapperX<ApiOrderDO>()
+                        .selectAll(ApiOrderDO.class)
+                        .selectAs(ApiCategoryDO::getName, AppApiOrderRespVO::getCategoryName)
+                        .leftJoin(ApiDO.class, ApiDO::getId, ApiOrderDO::getApiId)
+                        .leftJoin(ApiCategoryDO.class, ApiCategoryDO::getId, ApiDO::getCategoryId)
+                        // eq 条件
                         .eqIfPresent(ApiOrderDO::getUserId, reqVO.getUserId())
+                        .eqIfPresent(ApiCategoryDO::getId, reqVO.getCategoryId())
                         .eqIfPresent(ApiOrderDO::getStatus, reqVO.getStatus())
-                .like(!StringUtils.isEmpty(reqVO.getSearchQuery()), ApiOrderDO::getOrderNo, reqVO.getSearchQuery())
-                .or(!StringUtils.isEmpty(reqVO.getSearchQuery()))
-                .like(!StringUtils.isEmpty(reqVO.getSearchQuery()), ApiOrderDO::getApiName, reqVO.getSearchQuery())
-                .orderByDesc(ApiOrderDO::getId));
+                        // like 条件 OR 包裹在 and 内
+                        .and(!StringUtils.isEmpty(reqVO.getSearchQuery()), wrapper ->
+                                wrapper.like(ApiOrderDO::getOrderNo, reqVO.getSearchQuery())
+                                        .or()
+                                        .like(ApiOrderDO::getApiName, reqVO.getSearchQuery())
+                        )
+                        // 排序
+                        .orderByDesc(ApiOrderDO::getCreateTime)
+        );
+
     }
 
 

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/service/apiorder/ApiOrderService.java

@@ -5,6 +5,7 @@ import javax.validation.*;
 import com.luhu.computility.module.apihub.controller.admin.apiorder.vo.*;
 import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderCreateReqVO;
 import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderPageReqVO;
+import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderRespVO;
 import com.luhu.computility.module.apihub.dal.dataobject.apiorder.ApiOrderDO;
 import com.luhu.computility.framework.common.pojo.PageResult;
 import com.luhu.computility.framework.common.pojo.PageParam;
@@ -80,7 +81,7 @@ public interface ApiOrderService {
      * @param pageReqVO 分页查询
      * @return api订单分页
      */
-    PageResult<ApiOrderDO> getAppApiOrderPage(AppApiOrderPageReqVO pageReqVO);
+    PageResult<AppApiOrderRespVO> getAppApiOrderPage(AppApiOrderPageReqVO pageReqVO);
 
 
     /**

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/service/apiorder/ApiOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.luhu.computility.framework.common.util.string.StrUtils;
 import com.luhu.computility.module.apihub.config.ApiOrderProperties;
 import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderCreateReqVO;
 import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderPageReqVO;
+import com.luhu.computility.module.apihub.controller.app.apiorder.vo.AppApiOrderRespVO;
 import com.luhu.computility.module.apihub.dal.dataobject.api.ApiDO;
 import com.luhu.computility.module.apihub.dal.dataobject.apipackage.ApiPackageDO;
 import com.luhu.computility.module.apihub.dal.redis.no.ApiOrderNoRedisDAO;
@@ -139,7 +140,7 @@ public class ApiOrderServiceImpl implements ApiOrderService {
     }
 
     @Override
-    public PageResult<ApiOrderDO> getAppApiOrderPage(AppApiOrderPageReqVO pageReqVO) {
+    public PageResult<AppApiOrderRespVO> getAppApiOrderPage(AppApiOrderPageReqVO pageReqVO) {
         return apiOrderMapper.selectAppPage(pageReqVO);
     }
 

computility-module-infra/src/main/java/com/luhu/computility/module/infra/controller/admin/file/FileController.java

@@ -126,10 +126,10 @@ public class FileController {
     }
 
     @GetMapping("/preview")
-    @Operation(summary = "购买PDF 文件预览")
+    @Operation(summary = "PDF 文件预览")
     @PermitAll
-    public void previewPdf(HttpServletResponse response) throws IOException {
-        File file = new File("/Users/jackey/data/code/buy.pdf");
+    public void previewPdf(HttpServletResponse response, String url) throws IOException {
+        File file = new File(url);
         if (!file.exists()) {
             response.setStatus(HttpServletResponse.SC_NOT_FOUND);
             return;

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourcePageReqVO.java

@@ -20,11 +20,8 @@ public class ResourcePageReqVO extends PageParam {
     @Schema(description = "类型", example = "1")
     private Long categoryId;
 
-    @Schema(description = "客户id", example = "19646")
-    private Long memberUserId;
-
-    @Schema(description = "关联订单id", example = "11797")
-    private Long tradeOrderId;
+    @Schema(description = "用户手机", example = "11797")
+    private String mobile;
 
     @Schema(description = "关联订单No", example = "11797")
     private String tradeOrderNo;

computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourceRespVO.java

@@ -20,6 +20,9 @@ public class ResourceRespVO {
     @ExcelProperty("类型")
     private Long categoryId;
 
+    @Schema(description = "手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("手机")
+    private String mobile;
 
     @Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("类型名称")

computility-module-member/src/main/java/com/luhu/computility/module/member/dal/mysql/resource/ResourceMapper.java

@@ -50,9 +50,8 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> {
                 .select(MemberUserDO::getMobile)
                 .selectAs(MemberUserDO::getName, ResourceRespVO::getMemberUserName)
                 .leftJoin(MemberUserDO.class, MemberUserDO::getId, ResourceDO::getMemberUserId)
-                .eq(!ObjectUtil.isEmpty(reqVO.getMemberUserId()), ResourceDO::getMemberUserId, reqVO.getMemberUserId())
-                .eq(!ObjectUtil.isEmpty(reqVO.getTradeOrderId()),ResourceDO::getTradeOrderId, reqVO.getTradeOrderId())
-                .eq(!ObjectUtil.isEmpty(reqVO.getTradeOrderNo()),ResourceDO::getTradeOrderNo, reqVO.getTradeOrderNo())
+                .like(!ObjectUtil.isEmpty(reqVO.getMobile()), MemberUserDO::getMobile, reqVO.getMobile())
+                .like(!ObjectUtil.isEmpty(reqVO.getTradeOrderNo()),ResourceDO::getTradeOrderNo, reqVO.getTradeOrderNo())
                 .orderByDesc(ResourceDO::getId));
     }