From 8e95d1b39001cf348905d815517f614a73f6d6f9 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 3 Jan 2025 16:46:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ycwl/basic/mapper/OrderMapper.java | 2 +- .../model/pc/order/resp/OrderAppRespVO.java | 11 +- .../model/pc/order/resp/OrderItemVO.java | 2 + .../service/impl/pc/OrderServiceImpl.java | 20 +- src/main/resources/mapper/OrderMapper.xml | 176 +++++++----------- 5 files changed, 69 insertions(+), 142 deletions(-) diff --git a/src/main/java/com/ycwl/basic/mapper/OrderMapper.java b/src/main/java/com/ycwl/basic/mapper/OrderMapper.java index 2ac7d42..af63c8c 100644 --- a/src/main/java/com/ycwl/basic/mapper/OrderMapper.java +++ b/src/main/java/com/ycwl/basic/mapper/OrderMapper.java @@ -31,7 +31,7 @@ public interface OrderMapper { */ int addOrderItems(List orderItems); - int getOrderCount(OrderReqQuery query); + int countByUserId(Long userId); List appList(OrderAppPageReq orderReqQuery); diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java index 321b968..8568fd9 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderAppRespVO.java @@ -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 orderItemList; } diff --git a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java index 5b8435c..9876869 100644 --- a/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java +++ b/src/main/java/com/ycwl/basic/model/pc/order/resp/OrderItemVO.java @@ -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; } diff --git a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java index 0965f99..25195aa 100644 --- a/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/impl/pc/OrderServiceImpl.java @@ -261,24 +261,13 @@ public class OrderServiceImpl implements OrderService { @Override public ApiResponse 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> appPageQuery(OrderAppPageReq orderReqQuery) { PageHelper.startPage(orderReqQuery.getPageNum(), orderReqQuery.getPageSize()); List list = orderMapper.appList(orderReqQuery); - for (OrderAppRespVO appRespVO : list) { - List 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 pageInfo = new PageInfo<>(list); return ApiResponse.success(pageInfo); } @@ -286,13 +275,6 @@ public class OrderServiceImpl implements OrderService { @Override public ApiResponse appDetail(Long id) { OrderAppRespVO orderAppRespVO = orderMapper.appDetail(id); - List 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); } diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml index 8f5558a..1d3a62b 100644 --- a/src/main/resources/mapper/OrderMapper.xml +++ b/src/main/resources/mapper/OrderMapper.xml @@ -49,38 +49,67 @@ - - + + - - + + + - @@ -211,113 +240,34 @@ left join scenic s on o.scenic_id = s.id where o.id = #{id} - select count(1) num from `order` o - left join member m on o.member_id = m.id - - - and o.id = #{id} - - - and o.member_id = #{memberId} - - - and m.nickname like concat('%',#{memberNickname},'%') - - - and m.real_name like concat('%',#{memberRealName},'%') - - - and o.price = #{price} - - - and pay_price = #{payPrice} - - - and remark like concat('%',#{remark},'%') - - - and o.broker_id = #{brokerId} - - - and o.promo_code like concat('%',#{promoCode},'%') - - - and refund_reason like concat('%',#{refundReason},'%') - - - and refund_status = #{refundStatus} - - - and o.`status` = #{status} - - - and o.create_at >= #{startCreateTime} - - - and o.create_at <= #{endCreateTime} - - - and pay_at >= #{startPayTime} - - - and pay_at <= #{endPayTime} - - - and refund_at >= #{startRefundTime} - - - and refund_at <= #{endRefundTime} - - - and cancel_at >= #{startCancelTime} - - - and cancel_at <= #{endCancelTime} - - + where o.member_id = #{userId}