q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单详情

Browse Source
This commit is contained in:
Jerry Yan
2025-01-03 16:46:16 +08:00
parent a91389ca99
commit 8e95d1b390
5 changed files with 69 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ycwl/basic/mapper/OrderMapper.java
View File

@ -31,7 +31,7 @@ public interface OrderMapper {
*/
int addOrderItems(List<OrderItemEntity> orderItems);
int getOrderCount(OrderReqQuery query);
int countByUserId(Long userId);
List<OrderAppRespVO> appList(OrderAppPageReq orderReqQuery);

11
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java
View File

@ -77,21 +77,14 @@ public class OrderAppRespVO {
@ApiModelProperty("订单退款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date refundAt;
private Long scenicId;
@ApiModelProperty("景区名称")
private String scenicName;
@ApiModelProperty("商品名称")
private String goodsName;
@ApiModelProperty("拍摄时间")
private Date shootingTime;
/**
* 商品类型，0其他，1成片，2原片，3模板成片
*/
@ApiModelProperty("商品类型，1成片，2源素材")
@ApiModelProperty("商品类型，0成片，12源素材")
private Integer goodsType;
@ApiModelProperty("封面图片（来自模版封面图片）")
private String coverUrl;
@ApiModelProperty("原素材类型：1视频，2图像")
private Integer sourceType;
@ApiModelProperty("订单明细")
private List<OrderItemVO> orderItemList;
}

2
src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java
View File

@ -38,8 +38,10 @@ public class OrderItemVO {
private String videoUrl;
@ApiModelProperty("图片存储地址")
private String imgUrl;
private String coverUrl;
@ApiModelProperty("原素材类型：1视频，2图像")
private Integer sourceType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
private Date shootingTime;
}

20
src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java
View File

@ -261,24 +261,13 @@ public class OrderServiceImpl implements OrderService {
@Override
public ApiResponse<Integer> getOrderCountByUserId(Long userId) {
OrderReqQuery query = new OrderReqQuery();
query.setMemberId(userId);
return ApiResponse.success(orderMapper.getOrderCount(query));
return ApiResponse.success(orderMapper.countByUserId(userId));
}
@Override
public ApiResponse<PageInfo<OrderAppRespVO>> appPageQuery(OrderAppPageReq orderReqQuery) {
PageHelper.startPage(orderReqQuery.getPageNum(), orderReqQuery.getPageSize());
List<OrderAppRespVO> list = orderMapper.appList(orderReqQuery);
for (OrderAppRespVO appRespVO : list) {
List<OrderItemVO> orderItemList = appRespVO.getOrderItemList();
if (orderItemList != null && !orderItemList.isEmpty()) {
OrderItemVO itemVO = orderItemList.get(NumberConstant.ZERO);
appRespVO.setScenicName(itemVO.getScenicName());
appRespVO.setGoodsName(itemVO.getGoodsName());
appRespVO.setSourceType(itemVO.getSourceType());
}
}
PageInfo<OrderAppRespVO> pageInfo = new PageInfo<>(list);
return ApiResponse.success(pageInfo);
}
@ -286,13 +275,6 @@ public class OrderServiceImpl implements OrderService {
@Override
public ApiResponse<OrderAppRespVO> appDetail(Long id) {
OrderAppRespVO orderAppRespVO = orderMapper.appDetail(id);
List<OrderItemVO> orderItemList = orderAppRespVO.getOrderItemList();
if (orderItemList != null && !orderItemList.isEmpty()) {
OrderItemVO itemVO = orderItemList.get(NumberConstant.ZERO);
orderAppRespVO.setScenicName(itemVO.getScenicName());
orderAppRespVO.setGoodsName(itemVO.getGoodsName());
orderAppRespVO.setSourceType(itemVO.getSourceType());
}
return ApiResponse.success(orderAppRespVO);
}