Skip to content

phsl / api

Go to a project
Commit b9d8636c by lijinqi
Options

行业应用homepage字段修改、 

我的资源修改
客户端 我的订单接口
parent 1c71b766
Showing with 232 additions and 21 deletions
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationRespVO.java
...@@ -42,7 +42,7 @@ public class IndustryApplicationRespVO { ...@@ -42,7 +42,7 @@ public class IndustryApplicationRespVO {
@Schema(description = "首页展示图片") @Schema(description = "首页展示图片")
@ExcelProperty("首页展示图片") @ExcelProperty("首页展示图片")
private List<String> homeImages; private String homeImage;
@Schema(description = "组件类型：0-全部", example = "1") @Schema(description = "组件类型：0-全部", example = "1")
@ExcelProperty("组件类型：0-全部") @ExcelProperty("组件类型：0-全部")
......
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/industryapplication/vo/IndustryApplicationSaveReqVO.java
...@@ -37,7 +37,7 @@ public class IndustryApplicationSaveReqVO { ...@@ -37,7 +37,7 @@ public class IndustryApplicationSaveReqVO {
private String remark; private String remark;
@Schema(description = "首页展示图片") @Schema(description = "首页展示图片")
private List<String> homeImages; private String homeImage;
@Schema(description = "组件类型：0-全部", example = "1") @Schema(description = "组件类型：0-全部", example = "1")
private Integer type; private Integer type;
......
computility-module-mall/computility-module-trade-api/src/main/java/com/luhu/computility/module/trade/enums/order/TradeOrderStatusEnum.java
...@@ -18,7 +18,7 @@ import java.util.Arrays; ...@@ -18,7 +18,7 @@ import java.util.Arrays;
public enum TradeOrderStatusEnum implements ArrayValuable<Integer> { public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
UNPAID(0, "待支付"), UNPAID(0, "待支付"),
UNDELIVERED(10, "待发货"), UNDELIVERED(10, "已支付"),
DELIVERED(20, "已发货"), DELIVERED(20, "已发货"),
COMPLETED(30, "已完成"), COMPLETED(30, "已完成"),
CANCELED(40, "已取消"); CANCELED(40, "已取消");
...@@ -113,4 +113,34 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> { ...@@ -113,4 +113,34 @@ public enum TradeOrderStatusEnum implements ArrayValuable<Integer> {
return ObjectUtils.equalsAny(status, DELIVERED.getStatus(), COMPLETED.getStatus()); return ObjectUtils.equalsAny(status, DELIVERED.getStatus(), COMPLETED.getStatus());
} }
/**
* 根据 status 获取枚举
*
* @param status 状态值
* @return 枚举，找不到返回 null
*/
public static TradeOrderStatusEnum fromStatus(Integer status) {
if (status == null) {
return null;
}
for (TradeOrderStatusEnum value : values()) {
if (value.getStatus().equals(status)) {
return value;
}
}
return null;
}
/**
* 根据 status 获取状态名
*
* @param status 状态值
* @return 状态名，找不到返回 null
*/
public static String getNameByStatus(Integer status) {
TradeOrderStatusEnum statusEnum = fromStatus(status);
return statusEnum != null ? statusEnum.getName() : null;
}
} }
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/AppTradeOrderController.java
package com.luhu.computility.module.trade.controller.app.order; package com.luhu.computility.module.trade.controller.app.order;
import cn.hutool.core.collection.CollectionUtil;
import com.luhu.computility.framework.common.pojo.CommonResult; import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.pojo.PageResult; import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.module.pay.api.notify.dto.PayOrderNotifyReqDTO; import com.luhu.computility.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
...@@ -11,6 +12,7 @@ import com.luhu.computility.module.trade.dal.dataobject.delivery.DeliveryExpress ...@@ -11,6 +12,7 @@ import com.luhu.computility.module.trade.dal.dataobject.delivery.DeliveryExpress
import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderDO; import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderDO;
import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderItemDO; import com.luhu.computility.module.trade.dal.dataobject.order.TradeOrderItemDO;
import com.luhu.computility.module.trade.enums.order.TradeOrderStatusEnum; import com.luhu.computility.module.trade.enums.order.TradeOrderStatusEnum;
import com.luhu.computility.module.trade.enums.order.TradeOrderTypeEnum;
import com.luhu.computility.module.trade.framework.order.config.TradeOrderProperties; import com.luhu.computility.module.trade.framework.order.config.TradeOrderProperties;
import com.luhu.computility.module.trade.service.aftersale.AfterSaleService; import com.luhu.computility.module.trade.service.aftersale.AfterSaleService;
import com.luhu.computility.module.trade.service.delivery.DeliveryExpressService; import com.luhu.computility.module.trade.service.delivery.DeliveryExpressService;
...@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -30,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.annotation.security.PermitAll; import javax.annotation.security.PermitAll;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -129,14 +132,38 @@ public class AppTradeOrderController { ...@@ -129,14 +132,38 @@ public class AppTradeOrderController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得交易订单分页") @Operation(summary = "获得交易订单分页")
public CommonResult<PageResult<AppTradeOrderPageItemRespVO>> getOrderPage(AppTradeOrderPageReqVO reqVO) { public CommonResult<PageResult<AppTradeOrderPageRespVO>> getOrderPage(AppTradeOrderPageReqVO reqVO) {
// 查询订单 // 查询订单
PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(getLoginUserId(), reqVO); PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(getLoginUserId(), reqVO);
// 查询订单项 // 查询订单项
List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId( List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
convertSet(pageResult.getList(), TradeOrderDO::getId)); convertSet(pageResult.getList(), TradeOrderDO::getId));
//原始完整订单
PageResult<AppTradeOrderPageItemRespVO> sourcePageResult = TradeOrderConvert.INSTANCE.convertPage02(pageResult, orderItems);
//基于原有数据接口做处理
PageResult<AppTradeOrderPageRespVO> targetPageResult = new PageResult<>();
List<AppTradeOrderPageRespVO> appTradeOrders = new ArrayList<>();
if (!CollectionUtil.isEmpty(sourcePageResult.getList())) {
for (AppTradeOrderPageItemRespVO item : sourcePageResult.getList()) {
AppTradeOrderPageRespVO appTradeOrder = new AppTradeOrderPageRespVO();
appTradeOrder.setNo(item.getNo());
appTradeOrder.setPayPrice(item.getPayPrice());
appTradeOrder.setCreateTime(item.getCreateTime());
appTradeOrder.setProductCount(item.getProductCount());
//每个订单只有一个子订单
appTradeOrder.setSpuName(item.getItems().get(0).getSpuName());
appTradeOrder.setStatus(item.getStatus());
appTradeOrder.setStatusName(TradeOrderStatusEnum.getNameByStatus(item.getStatus()));
appTradeOrder.setProperties(item.getItems().get(0).getProperties());
appTradeOrders.add(appTradeOrder);
}
}
targetPageResult.setList(appTradeOrders);
targetPageResult.setTotal(sourcePageResult.getTotal());
// 最终组合 // 最终组合
return success(TradeOrderConvert.INSTANCE.convertPage02(pageResult, orderItems)); return success(targetPageResult);
} }
@GetMapping("/get-count") @GetMapping("/get-count")
......
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/vo/AppTradeOrderPageRespVO.java 0 → 100644
package com.luhu.computility.module.trade.controller.app.order.vo;
import com.luhu.computility.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "用户 App - 订单交易的分页项 Response VO")
@Data
public class AppTradeOrderPageRespVO {
@Schema(description = "订单流水号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1146347329394184195")
private String no;
@Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status;
@Schema(description = "订单状态名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private String statusName;
@Schema(description = "购买的数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer productCount;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String spuName;
private List<AppProductPropertyValueDetailRespVO> properties;
@Schema(description = "应付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
private Integer payPrice;
}
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/service/order/TradeOrderToResourceServiceImpl.java
...@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; ...@@ -7,6 +7,10 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.luhu.computility.framework.common.util.json.JsonUtils; import com.luhu.computility.framework.common.util.json.JsonUtils;
import com.luhu.computility.module.member.controller.admin.resource.vo.ResourceSaveReqVO; import com.luhu.computility.module.member.controller.admin.resource.vo.ResourceSaveReqVO;
import com.luhu.computility.module.member.service.resource.ResourceService; import com.luhu.computility.module.member.service.resource.ResourceService;
import com.luhu.computility.module.product.api.sku.ProductSkuApi;
import com.luhu.computility.module.product.api.spu.ProductSpuApi;
import com.luhu.computility.module.product.dal.dataobject.category.ProductCategoryDO;
import com.luhu.computility.module.product.service.category.ProductCategoryService;
import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO; import com.luhu.computility.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
import com.luhu.computility.module.trade.convert.order.TradeOrderConvert; import com.luhu.computility.module.trade.convert.order.TradeOrderConvert;
import com.luhu.computility.module.trade.convert.order.TradeOrderLogConvert; import com.luhu.computility.module.trade.convert.order.TradeOrderLogConvert;
...@@ -41,6 +45,9 @@ public class TradeOrderToResourceServiceImpl implements TradeOrderToResourceServ ...@@ -41,6 +45,9 @@ public class TradeOrderToResourceServiceImpl implements TradeOrderToResourceServ
@Resource @Resource
private ResourceService resourceService; private ResourceService resourceService;
@Resource
private ProductCategoryService productCategoryService;
@Override @Override
public void createMyResource(Long orderId) { public void createMyResource(Long orderId) {
...@@ -59,10 +66,13 @@ public class TradeOrderToResourceServiceImpl implements TradeOrderToResourceServ ...@@ -59,10 +66,13 @@ public class TradeOrderToResourceServiceImpl implements TradeOrderToResourceServ
ResourceSaveReqVO resourceSaveReqVO = new ResourceSaveReqVO(); ResourceSaveReqVO resourceSaveReqVO = new ResourceSaveReqVO();
TradeOrderItemDO tradeOrderItemDO = items.get(0); TradeOrderItemDO tradeOrderItemDO = items.get(0);
if (!ObjectUtils.isEmpty(tradeOrderItemDO)) { if (!ObjectUtils.isEmpty(tradeOrderItemDO)) {
ProductCategoryDO category = productCategoryService.getCategory(tradeOrderItemDO.getCategoryId());
resourceSaveReqVO.setCategoryName(category.getName());
resourceSaveReqVO.setMemberUserId(order.getUserId()); resourceSaveReqVO.setMemberUserId(order.getUserId());
resourceSaveReqVO.setCategoryId(tradeOrderItemDO.getCategoryId()); resourceSaveReqVO.setCategoryId(tradeOrderItemDO.getCategoryId());
resourceSaveReqVO.setAuth(tradeOrderItemDO.getAuth()); resourceSaveReqVO.setAuth(tradeOrderItemDO.getAuth());
resourceSaveReqVO.setTradeOrderId(order.getId()); resourceSaveReqVO.setTradeOrderId(order.getId());
resourceSaveReqVO.setTradeOrderNo(order.getNo());
resourceSaveReqVO.setExpDuration(tradeOrderItemDO.getExpDuration()); resourceSaveReqVO.setExpDuration(tradeOrderItemDO.getExpDuration());
resourceSaveReqVO.setFeeInfo(tradeOrderItemDO.getFeeInfo()); resourceSaveReqVO.setFeeInfo(tradeOrderItemDO.getFeeInfo());
List<ResourceSaveReqVO.Property> properties = new ArrayList<>(); List<ResourceSaveReqVO.Property> properties = new ArrayList<>();
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/ResourceController.java
...@@ -84,8 +84,8 @@ public class ResourceController { ...@@ -84,8 +84,8 @@ public class ResourceController {
@Operation(summary = "获得用户资源分页") @Operation(summary = "获得用户资源分页")
@PreAuthorize("@ss.hasPermission('member:resource:query')") @PreAuthorize("@ss.hasPermission('member:resource:query')")
public CommonResult<PageResult<ResourceRespVO>> getResourcePage(@Valid ResourcePageReqVO pageReqVO) { public CommonResult<PageResult<ResourceRespVO>> getResourcePage(@Valid ResourcePageReqVO pageReqVO) {
PageResult<ResourceDO> pageResult = resourceService.getResourcePage(pageReqVO); PageResult<ResourceRespVO> pageResult = resourceService.getResourcePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ResourceRespVO.class)); return success(pageResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
...@@ -95,10 +95,10 @@ public class ResourceController { ...@@ -95,10 +95,10 @@ public class ResourceController {
public void exportResourceExcel(@Valid ResourcePageReqVO pageReqVO, public void exportResourceExcel(@Valid ResourcePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ResourceDO> list = resourceService.getResourcePage(pageReqVO).getList(); List<ResourceRespVO> list = resourceService.getResourcePage(pageReqVO).getList();
// 导出 Excel // 导出 Excel
ExcelUtils.write(response, "用户资源.xls", "数据", ResourceRespVO.class, ExcelUtils.write(response, "用户资源.xls", "数据", ResourceRespVO.class,
BeanUtils.toBean(list, ResourceRespVO.class)); list);
} }
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourcePageReqVO.java
...@@ -26,6 +26,9 @@ public class ResourcePageReqVO extends PageParam { ...@@ -26,6 +26,9 @@ public class ResourcePageReqVO extends PageParam {
@Schema(description = "关联订单id", example = "11797") @Schema(description = "关联订单id", example = "11797")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单No", example = "11797")
private String tradeOrderNo;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourceRespVO.java
...@@ -20,14 +20,29 @@ public class ResourceRespVO { ...@@ -20,14 +20,29 @@ public class ResourceRespVO {
@ExcelProperty("类型") @ExcelProperty("类型")
private Long categoryId; private Long categoryId;
@Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("类型名称")
private String categoryName;
@Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646") @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
@ExcelProperty("客户id") @ExcelProperty("客户id")
private Long memberUserId; private Long memberUserId;
@Schema(description = "客户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
@ExcelProperty("客户名称")
private String memberUserName;
@Schema(description = "关联订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797") @Schema(description = "关联订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@ExcelProperty("关联订单id") @ExcelProperty("关联订单id")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单NO", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@ExcelProperty("关联订单NO")
private String tradeOrderNo;
@Schema(description = "属性") @Schema(description = "属性")
@ExcelProperty("属性") @ExcelProperty("属性")
private List<ResourceSaveReqVO.Property> properties; private List<ResourceSaveReqVO.Property> properties;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/resource/vo/ResourceSaveReqVO.java
...@@ -22,6 +22,10 @@ public class ResourceSaveReqVO { ...@@ -22,6 +22,10 @@ public class ResourceSaveReqVO {
@NotNull(message = "类型不能为空") @NotNull(message = "类型不能为空")
private Long categoryId; private Long categoryId;
@Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "类型不能为空")
private String categoryName;
@Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646") @Schema(description = "客户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19646")
@NotNull(message = "客户id不能为空") @NotNull(message = "客户id不能为空")
private Long memberUserId; private Long memberUserId;
...@@ -30,6 +34,11 @@ public class ResourceSaveReqVO { ...@@ -30,6 +34,11 @@ public class ResourceSaveReqVO {
@NotNull(message = "关联订单id不能为空") @NotNull(message = "关联订单id不能为空")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单NO", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@NotNull(message = "关联订单NO不能为空")
private String tradeOrderNo;
@Schema(description = "过期时间") @Schema(description = "过期时间")
private LocalDateTime expTime; private LocalDateTime expTime;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/AppResourceController.java
...@@ -7,6 +7,7 @@ import com.luhu.computility.framework.common.pojo.PageResult; ...@@ -7,6 +7,7 @@ import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.util.object.BeanUtils; import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.framework.excel.core.util.ExcelUtils; import com.luhu.computility.framework.excel.core.util.ExcelUtils;
import com.luhu.computility.module.member.controller.admin.resource.vo.ResourcePageReqVO; import com.luhu.computility.module.member.controller.admin.resource.vo.ResourcePageReqVO;
import com.luhu.computility.module.member.controller.admin.resource.vo.ResourceRespVO;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO; import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourceRespVO; import com.luhu.computility.module.member.controller.app.resource.vo.AppResourceRespVO;
import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO; import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO;
...@@ -51,21 +52,21 @@ public class AppResourceController { ...@@ -51,21 +52,21 @@ public class AppResourceController {
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得我的资源分页") @Operation(summary = "获得我的资源分页")
public CommonResult<PageResult<AppResourceRespVO>> getResourcePage(@Valid ResourcePageReqVO pageReqVO) { public CommonResult<PageResult<AppResourceRespVO>> getResourcePage(@Valid AppResourcePageReqVO pageReqVO) {
PageResult<ResourceDO> pageResult = resourceService.getResourcePage(pageReqVO); PageResult<AppResourceRespVO> pageResult = resourceService.getMyResourcePage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AppResourceRespVO.class)); return success(pageResult);
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出我的资源 Excel") @Operation(summary = "导出我的资源 Excel")
@ApiAccessLog(operateType = EXPORT) @ApiAccessLog(operateType = EXPORT)
public void exportResourceExcel(@Valid ResourcePageReqVO pageReqVO, public void exportResourceExcel(@Valid AppResourcePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<ResourceDO> list = resourceService.getResourcePage(pageReqVO).getList(); List<AppResourceRespVO> list = resourceService.getMyResourcePage(pageReqVO).getList();
// 导出 Excel // 导出 Excel
ExcelUtils.write(response, "我的资源.xls", "数据", AppResourceRespVO.class, ExcelUtils.write(response, "我的资源.xls", "数据", AppResourceRespVO.class,
BeanUtils.toBean(list, AppResourceRespVO.class)); list);
} }
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourcePageReqVO.java
...@@ -19,6 +19,8 @@ public class AppResourcePageReqVO extends PageParam { ...@@ -19,6 +19,8 @@ public class AppResourcePageReqVO extends PageParam {
@Schema(description = "关联订单id", example = "11797") @Schema(description = "关联订单id", example = "11797")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单NO", example = "11797")
private String tradeOrderNo;
@Schema(description = "用户id", example = "11797") @Schema(description = "用户id", example = "11797")
private Long memberUserId; private Long memberUserId;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourceRespVO.java
...@@ -22,10 +22,18 @@ public class AppResourceRespVO { ...@@ -22,10 +22,18 @@ public class AppResourceRespVO {
@ExcelProperty("分类") @ExcelProperty("分类")
private Long categoryId; private Long categoryId;
@Schema(description = "类型名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("类型名称")
private String categoryName;
@Schema(description = "关联订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797") @Schema(description = "关联订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@ExcelProperty("关联订单id") @ExcelProperty("关联订单id")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单No", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@ExcelProperty("关联订单No")
private String tradeOrderNo;
@Schema(description = "属性") @Schema(description = "属性")
@ExcelProperty("属性") @ExcelProperty("属性")
private List<ResourceSaveReqVO.Property> properties; private List<ResourceSaveReqVO.Property> properties;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/resource/vo/AppResourceSaveReqVO.java
...@@ -28,6 +28,10 @@ public class AppResourceSaveReqVO { ...@@ -28,6 +28,10 @@ public class AppResourceSaveReqVO {
@NotNull(message = "关联订单id不能为空") @NotNull(message = "关联订单id不能为空")
private Long tradeOrderId; private Long tradeOrderId;
@Schema(description = "关联订单No", requiredMode = Schema.RequiredMode.REQUIRED, example = "11797")
@NotNull(message = "关联订单No不能为空")
private String tradeOrderNo;
@Schema(description = "过期时间") @Schema(description = "过期时间")
private LocalDateTime expTime; private LocalDateTime expTime;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/user/AppMemberUserController.java
...@@ -58,8 +58,12 @@ public class AppMemberUserController { ...@@ -58,8 +58,12 @@ public class AppMemberUserController {
if (!ObjectUtil.isEmpty(enterprise)) { if (!ObjectUtil.isEmpty(enterprise)) {
appEnterpriseUserInfoRespVO.setEnterpriseName(enterprise.getEnterpriseName()); appEnterpriseUserInfoRespVO.setEnterpriseName(enterprise.getEnterpriseName());
appEnterpriseUserInfoRespVO.setCheckStatus(enterprise.getStatus()); appEnterpriseUserInfoRespVO.setCheckStatus(enterprise.getStatus());
appEnterpriseUserInfoRespVO.setCheckStatusName(EnterpriseCheckStatus.getByValue(enterprise.getStatus()).getRemark());
} else { } else {
appEnterpriseUserInfoRespVO.setCheckStatus(EnterpriseCheckStatus.UNSUBMIT.getValue()); appEnterpriseUserInfoRespVO.setCheckStatus(EnterpriseCheckStatus.UNSUBMIT.getValue());
appEnterpriseUserInfoRespVO.setCheckStatusName(EnterpriseCheckStatus.UNSUBMIT.getRemark());
} }
return success(appEnterpriseUserInfoRespVO); return success(appEnterpriseUserInfoRespVO);
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/user/vo/AppEnterpriseUserInfoRespVO.java
...@@ -28,6 +28,9 @@ public class AppEnterpriseUserInfoRespVO { ...@@ -28,6 +28,9 @@ public class AppEnterpriseUserInfoRespVO {
@Schema(description = "审核状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @Schema(description = "审核状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer checkStatus; private Integer checkStatus;
@Schema(description = "审核状态名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private String checkStatusName;
@Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String enterpriseName; private String enterpriseName;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/dal/dataobject/resource/ResourceDO.java
package com.luhu.computility.module.member.dal.dataobject.resource; package com.luhu.computility.module.member.dal.dataobject.resource;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -9,6 +10,8 @@ import java.time.LocalDateTime; ...@@ -9,6 +10,8 @@ import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO; import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
import javax.validation.constraints.NotNull;
/** /**
* 用户资源 DO * 用户资源 DO
* *
...@@ -34,6 +37,10 @@ public class ResourceDO extends BaseDO { ...@@ -34,6 +37,10 @@ public class ResourceDO extends BaseDO {
*/ */
private Integer categoryId; private Integer categoryId;
/** /**
* 类型名称
*/
private String categoryName;
/**
* 客户id * 客户id
*/ */
private Long memberUserId; private Long memberUserId;
...@@ -42,6 +49,10 @@ public class ResourceDO extends BaseDO { ...@@ -42,6 +49,10 @@ public class ResourceDO extends BaseDO {
*/ */
private Long tradeOrderId; private Long tradeOrderId;
/** /**
* 关联订单No
*/
private String tradeOrderNo;
/**
* 属性 * 属性
*/ */
@TableField(typeHandler = JacksonTypeHandler.class) @TableField(typeHandler = JacksonTypeHandler.class)
......
computility-module-member/src/main/java/com/luhu/computility/module/member/dal/mysql/resource/ResourceMapper.java
...@@ -2,11 +2,15 @@ package com.luhu.computility.module.member.dal.mysql.resource; ...@@ -2,11 +2,15 @@ package com.luhu.computility.module.member.dal.mysql.resource;
import java.util.*; import java.util.*;
import cn.hutool.core.util.ObjectUtil;
import com.luhu.computility.framework.common.pojo.PageResult; import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX; import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX; import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO; import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourceRespVO;
import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO; import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO;
import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import com.luhu.computility.module.member.controller.admin.resource.vo.*; import com.luhu.computility.module.member.controller.admin.resource.vo.*;
...@@ -17,15 +21,16 @@ import com.luhu.computility.module.member.controller.admin.resource.vo.*; ...@@ -17,15 +21,16 @@ import com.luhu.computility.module.member.controller.admin.resource.vo.*;
*/ */
@Mapper @Mapper
public interface ResourceMapper extends BaseMapperX<ResourceDO> { public interface ResourceMapper extends BaseMapperX<ResourceDO> {
/*
default PageResult<ResourceDO> selectPage(ResourcePageReqVO reqVO) { default PageResult<ResourceDO> selectPage(ResourcePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ResourceDO>() return selectPage(reqVO, new LambdaQueryWrapperX<ResourceDO>()
.eqIfPresent(ResourceDO::getCategoryId, reqVO.getCategoryId()) .eqIfPresent(ResourceDO::getCategoryId, reqVO.getCategoryId())
.eqIfPresent(ResourceDO::getMemberUserId, reqVO.getMemberUserId()) .eqIfPresent(ResourceDO::getMemberUserId, reqVO.getMemberUserId())
.eqIfPresent(ResourceDO::getTradeOrderId, reqVO.getTradeOrderId()) .eqIfPresent(ResourceDO::getTradeOrderId, reqVO.getTradeOrderId())
.eqIfPresent(ResourceDO::getTradeOrderNo, reqVO.getTradeOrderNo())
.betweenIfPresent(ResourceDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(ResourceDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ResourceDO::getId)); .orderByDesc(ResourceDO::getId));
} }*/
default PageResult<ResourceDO> selectMyPage(AppResourcePageReqVO reqVO) { default PageResult<ResourceDO> selectMyPage(AppResourcePageReqVO reqVO) {
...@@ -33,8 +38,34 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> { ...@@ -33,8 +38,34 @@ public interface ResourceMapper extends BaseMapperX<ResourceDO> {
.eqIfPresent(ResourceDO::getCategoryId, reqVO.getCategoryId()) .eqIfPresent(ResourceDO::getCategoryId, reqVO.getCategoryId())
.eqIfPresent(ResourceDO::getMemberUserId, reqVO.getMemberUserId()) .eqIfPresent(ResourceDO::getMemberUserId, reqVO.getMemberUserId())
.eqIfPresent(ResourceDO::getTradeOrderId, reqVO.getTradeOrderId()) .eqIfPresent(ResourceDO::getTradeOrderId, reqVO.getTradeOrderId())
.eqIfPresent(ResourceDO::getTradeOrderNo, reqVO.getTradeOrderNo())
.betweenIfPresent(ResourceDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(ResourceDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ResourceDO::getId)); .orderByDesc(ResourceDO::getId));
} }
default PageResult<ResourceRespVO> selectPage(ResourcePageReqVO reqVO) {
return selectJoinPage(reqVO, ResourceRespVO.class, new MPJLambdaWrapperX<ResourceDO>()
.selectAll(ResourceDO.class)
.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())
.orderByDesc(ResourceDO::getId));
}
/*return selectJoinPage(queryVO, FruitRespVO.class, new MPJLambdaWrapperX<FruitDO>()
.selectAll(FruitDO.class)
.select(MemberUserDO::getMobile)
.select(MemberUserDO::getName)
.select(MemberUserDO::getNickname)
.leftJoin(MemberUserDO.class, MemberUserDO::getId, FruitDO::getUserId)
.eq(queryVO.getUserId() != null, FruitDO::getUserId, queryVO.getUserId())
.eq(queryVO.getId() != null, FruitDO::getId, queryVO.getId())
.like(StrUtil.isNotBlank(queryVO.getContent()), FruitDO::getContent, queryVO.getContent())
.between(!ArrayUtil.hasNull(queryVO.getCreateTime()), FruitDO::getCreateTime, ArrayUtil.get(queryVO.getCreateTime(), 0), ArrayUtil.get(queryVO.getCreateTime(), 1))
.orderByDesc(FruitDO::getId));*/
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/service/resource/ResourceService.java
...@@ -4,6 +4,7 @@ import java.util.*; ...@@ -4,6 +4,7 @@ import java.util.*;
import javax.validation.*; import javax.validation.*;
import com.luhu.computility.module.member.controller.admin.resource.vo.*; import com.luhu.computility.module.member.controller.admin.resource.vo.*;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO; import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourceRespVO;
import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO; import com.luhu.computility.module.member.dal.dataobject.resource.ResourceDO;
import com.luhu.computility.framework.common.pojo.PageResult; import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.pojo.PageParam; import com.luhu.computility.framework.common.pojo.PageParam;
...@@ -58,7 +59,7 @@ public interface ResourceService { ...@@ -58,7 +59,7 @@ public interface ResourceService {
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @return 用户资源分页 * @return 用户资源分页
*/ */
PageResult<ResourceDO> getResourcePage(ResourcePageReqVO pageReqVO); PageResult<ResourceRespVO> getResourcePage(ResourcePageReqVO pageReqVO);
/** /**
* 获得我的用户资源分页 * 获得我的用户资源分页
...@@ -66,6 +67,6 @@ public interface ResourceService { ...@@ -66,6 +67,6 @@ public interface ResourceService {
* @param appResourcePageReqVO 分页查询 * @param appResourcePageReqVO 分页查询
* @return 我的用户资源分页 * @return 我的用户资源分页
*/ */
//PageResult<ResourceDO> getMyResourcePage(AppResourcePageReqVO appResourcePageReqVO); PageResult<AppResourceRespVO> getMyResourcePage(AppResourcePageReqVO appResourcePageReqVO);
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/service/resource/ResourceServiceImpl.java
package com.luhu.computility.module.member.service.resource; package com.luhu.computility.module.member.service.resource;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.luhu.computility.framework.security.core.util.SecurityFrameworkUtils;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourcePageReqVO;
import com.luhu.computility.module.member.controller.app.resource.vo.AppResourceRespVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -78,9 +81,15 @@ public class ResourceServiceImpl implements ResourceService { ...@@ -78,9 +81,15 @@ public class ResourceServiceImpl implements ResourceService {
} }
@Override @Override
public PageResult<ResourceDO> getResourcePage(ResourcePageReqVO pageReqVO) { public PageResult<ResourceRespVO> getResourcePage(ResourcePageReqVO pageReqVO) {
PageResult<ResourceDO> resourceDOPageResult = resourceMapper.selectPage(pageReqVO); PageResult<ResourceRespVO> resourceDOPageResult = resourceMapper.selectPage(pageReqVO);
return resourceDOPageResult; return resourceDOPageResult;
} }
@Override
public PageResult<AppResourceRespVO> getMyResourcePage(AppResourcePageReqVO pageReqVO) {
pageReqVO.setMemberUserId(SecurityFrameworkUtils.getLoginUserId());
PageResult<ResourceDO> resourceDOPageResult = resourceMapper.selectMyPage(pageReqVO);
return BeanUtils.toBean(resourceDOPageResult, AppResourceRespVO.class);
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment