api订单修改

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/admin/apiorder/ApiOrderController.java

@@ -102,8 +102,7 @@ public class ApiOrderController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('apihub:api-order:query')")
     @PreAuthorize("@ss.hasPermission('apihub:api-order:query')")
     public CommonResult<ApiOrderRespVO> getApiOrder(@RequestParam("id") Long id) {
     public CommonResult<ApiOrderRespVO> getApiOrder(@RequestParam("id") Long id) {
-        ApiOrderDO apiOrder = apiOrderService.getApiOrder(id);
-        return success(BeanUtils.toBean(apiOrder, ApiOrderRespVO.class));
+        return success(apiOrderService.getApiOrderWithUser(id));
     }
     }
 
 
     @GetMapping("/page")
     @GetMapping("/page")

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/admin/apiorder/vo/ApiOrderPageReqVO.java

@@ -20,6 +20,9 @@ public class ApiOrderPageReqVO extends PageParam {
     @Schema(description = "手机号")
     @Schema(description = "手机号")
     private String mobile;
     private String mobile;
 
 
+    @Schema(description = "用户昵称")
+    private String nickname;
+
     @Schema(description = "API应用名称")
     @Schema(description = "API应用名称")
     private String apiName;
     private String apiName;
 
 

computility-module-apihub/computility-module-apihub-biz/src/main/java/com/luhu/computility/module/apihub/controller/admin/apiorder/vo/ApiOrderRespVO.java

@@ -25,6 +25,9 @@ public class ApiOrderRespVO {
     @ExcelProperty("下单用户手机号")
     @ExcelProperty("下单用户手机号")
     private String userMobile;
     private String userMobile;
 
 
+    @Schema(description = "用户昵称")
+    private String userNickname;
+
     @Schema(description = "购买的API ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10347")
     @Schema(description = "购买的API ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10347")
     @ExcelProperty("购买的API ID")
     @ExcelProperty("购买的API ID")
     private Long apiId;
     private Long apiId;

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

@@ -60,9 +60,11 @@ public interface ApiOrderMapper extends BaseMapperX<ApiOrderDO> {
         return selectJoinPage(reqVO, ApiOrderRespVO.class, new MPJLambdaWrapperX<ApiOrderDO>()
         return selectJoinPage(reqVO, ApiOrderRespVO.class, new MPJLambdaWrapperX<ApiOrderDO>()
                 .selectAll(ApiOrderDO.class)
                 .selectAll(ApiOrderDO.class)
                 .selectAs(MemberUserDO::getMobile, ApiOrderRespVO::getUserMobile)
                 .selectAs(MemberUserDO::getMobile, ApiOrderRespVO::getUserMobile)
+                .selectAs(MemberUserDO::getNickname, ApiOrderRespVO::getUserNickname)
                 .leftJoin(MemberUserDO.class, MemberUserDO::getId, ApiOrderDO::getUserId)
                 .leftJoin(MemberUserDO.class, MemberUserDO::getId, ApiOrderDO::getUserId)
                 .eqIfPresent(ApiOrderDO::getUserId, reqVO.getUserId())
                 .eqIfPresent(ApiOrderDO::getUserId, reqVO.getUserId())
                 .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
                 .likeIfPresent(MemberUserDO::getMobile, reqVO.getMobile())
+                .likeIfPresent(MemberUserDO::getNickname, reqVO.getNickname())
                 .eqIfPresent(ApiOrderDO::getApiId, reqVO.getApiId())
                 .eqIfPresent(ApiOrderDO::getApiId, reqVO.getApiId())
                 .likeIfPresent(ApiOrderDO::getApiName, reqVO.getApiName())
                 .likeIfPresent(ApiOrderDO::getApiName, reqVO.getApiName())
                 .eqIfPresent(ApiOrderDO::getPackageId, reqVO.getPackageId())
                 .eqIfPresent(ApiOrderDO::getPackageId, reqVO.getPackageId())
@@ -99,6 +101,15 @@ public interface ApiOrderMapper extends BaseMapperX<ApiOrderDO> {
     }
     }
 
 
 
 
+    default ApiOrderRespVO selectByIdWithUser(Long id) {
+        return selectJoinOne(ApiOrderRespVO.class, new MPJLambdaWrapperX<ApiOrderDO>()
+                .selectAll(ApiOrderDO.class)
+                .selectAs(MemberUserDO::getMobile, ApiOrderRespVO::getUserMobile)
+                .selectAs(MemberUserDO::getNickname, ApiOrderRespVO::getUserNickname)
+                .leftJoin(MemberUserDO.class, MemberUserDO::getId, ApiOrderDO::getUserId)
+                .eq(ApiOrderDO::getId, id));
+    }
+
     default int updateByIdAndStatus(Long id, Integer status, ApiOrderDO update) {
     default int updateByIdAndStatus(Long id, Integer status, ApiOrderDO update) {
         return update(update, new LambdaUpdateWrapper<ApiOrderDO>()
         return update(update, new LambdaUpdateWrapper<ApiOrderDO>()
                 .eq(ApiOrderDO::getId, id).eq(ApiOrderDO::getStatus, status));
                 .eq(ApiOrderDO::getId, id).eq(ApiOrderDO::getStatus, status));

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

@@ -62,6 +62,14 @@ public interface ApiOrderService {
     ApiOrderDO getApiOrder(Long id);
     ApiOrderDO getApiOrder(Long id);
 
 
     /**
     /**
+     * 获得api订单详情（含用户信息）
+     *
+     * @param id 编号
+     * @return api订单详情
+     */
+    ApiOrderRespVO getApiOrderWithUser(Long id);
+
+    /**
      * 获得api订单List
      * 获得api订单List
      *
      *
      * @param reqVO
      * @param reqVO

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

@@ -159,6 +159,11 @@ public class ApiOrderServiceImpl implements ApiOrderService {
     }
     }
 
 
     @Override
     @Override
+    public ApiOrderRespVO getApiOrderWithUser(Long id) {
+        return apiOrderMapper.selectByIdWithUser(id);
+    }
+
+    @Override
     public List<ApiOrderDO> getOrderList(ApiOrderPageReqVO reqVO) {
     public List<ApiOrderDO> getOrderList(ApiOrderPageReqVO reqVO) {
         return apiOrderMapper.selectList(reqVO);
         return apiOrderMapper.selectList(reqVO);
     }
     }