From 8447e071cc56850a30b5ae97e7fd15eadff99ca3 Mon Sep 17 00:00:00 2001 From: "996472796@qq.com" <996472796@qq.com> Date: Mon, 8 Apr 2024 11:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Evpi=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/user/OrderUserQueryController.java | 11 ++++++ .../user/response/UserOrderRecordVo.java | 36 +++++++++++++++++++ .../persistent/dao/view/OrderViewDao.java | 3 ++ .../dam/query/order/OrderQueryService.java | 7 ++++ .../order/impl/OrderQueryServiceImpl.java | 7 ++++ .../mapper/order/OrderViewMapper.xml | 17 +++++++++ 6 files changed, 81 insertions(+) create mode 100644 dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserOrderRecordVo.java diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java index eab66f3..717cb0c 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java @@ -2,6 +2,7 @@ package com.qniao.dam.api.query.order.user; import com.qniao.dam.api.query.order.user.request.UserPageOrderByOperatorQueryParam; import com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo; +import com.qniao.dam.api.query.order.user.response.UserOrderRecordVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderByOperatorVo; import com.qniao.dam.domian.aggregate.order.constant.OrderStatusEnum; import com.qniao.dam.query.order.OrderQueryService; @@ -41,4 +42,14 @@ public class OrderUserQueryController { return orderQueryService.getOrderStatisticsByOperator(queryParam); } + @GetMapping("page/user/order/record") + @ApiOperation("客户获取订单记录分页列表") + public QnPage userUserOrderRecord(PageUtil pageUtil, + @RequestParam("miId") Long miId, + @RequestParam("userId") Long userId, + @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) { + + return orderQueryService.userUserOrderRecord(pageUtil,miId,userId,orgId); + } + } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserOrderRecordVo.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserOrderRecordVo.java new file mode 100644 index 0000000..b8f5067 --- /dev/null +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/response/UserOrderRecordVo.java @@ -0,0 +1,36 @@ +package com.qniao.dam.api.query.order.user.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.qniao.dam.domian.aggregate.product.constant.ProductMainCategoryEnum; +import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Data +public class UserOrderRecordVo { + + @ApiModelProperty("订单标识") + @JsonSerialize(using = ToStringSerializer.class) + private Long orderId; + + @ApiModelProperty("订单号") + private String orderCode; + + @ApiModelProperty("订单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime paid_time; + + @ApiModelProperty("结算金额") + private BigDecimal settlementAmount; + + @ApiModelProperty("产品次分类字符串集合") + private String subCategory; + + @ApiModelProperty("产品名称字符串集合") + private String productTitle; +} diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/OrderViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/OrderViewDao.java index 4ad117e..bcb1d60 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/OrderViewDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/OrderViewDao.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.qniao.dam.api.query.order.user.request.UserPageOrderByOperatorQueryParam; import com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo; +import com.qniao.dam.api.query.order.user.response.UserOrderRecordVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderByOperatorVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderItemByOperatorVo; import org.apache.ibatis.annotations.Mapper; @@ -19,4 +20,6 @@ public interface OrderViewDao { List listOrderItemByOperatorByOrderIds(@Param("orderIdList") List orderIdList); GetOrderStatisticsByOperatorVo getOrderStatisticsByOperator(@Param("queryParam") UserPageOrderByOperatorQueryParam queryParam); + + IPage userUserOrderRecord(Page pageWithoutOrders,@Param("miId") Long miId,@Param("userId") Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java index dd11d01..b37d489 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java @@ -3,11 +3,16 @@ package com.qniao.dam.query.order; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.order.user.request.UserPageOrderByOperatorQueryParam; import com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo; +import com.qniao.dam.api.query.order.user.response.UserOrderRecordVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderByOperatorVo; import com.qniao.dam.domain.aggregate.order.entity.Order; import com.qniao.dam.domain.aggregate.order.entity.OrderItem; import com.qniao.dam.domain.aggregate.productspec.entity.ProductSpec; +import com.qniao.dau.infrastructure.constant.RequestHeaderFields; +import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; public interface OrderQueryService { IPage pageOrderByOperator(PageUtil pageUtil, UserPageOrderByOperatorQueryParam queryParam); @@ -15,4 +20,6 @@ public interface OrderQueryService { GetOrderStatisticsByOperatorVo getOrderStatisticsByOperator(UserPageOrderByOperatorQueryParam queryParam); boolean checkDiffSpecRight(Order order, OrderItem orderItem, ProductSpec productSpec); + + QnPage userUserOrderRecord(PageUtil pageUtil,Long miId,Long userId,Long orgId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java index ec18468..f4c5cde 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java @@ -3,6 +3,7 @@ package com.qniao.dam.query.order.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.qniao.dam.api.query.order.user.request.UserPageOrderByOperatorQueryParam; import com.qniao.dam.api.query.order.user.response.GetOrderStatisticsByOperatorVo; +import com.qniao.dam.api.query.order.user.response.UserOrderRecordVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderByOperatorVo; import com.qniao.dam.api.query.order.user.response.UserPageOrderItemByOperatorVo; import com.qniao.dam.application.service.right.RightApplicationService; @@ -20,6 +21,7 @@ import com.qniao.dam.infrastructure.persistent.dao.view.OrderViewDao; import com.qniao.dam.query.order.OrderQueryService; import com.qniao.dam.query.product.ProductQueryService; import com.qniao.dam.query.right.RightQueryService; +import com.qniao.domain.QnPage; import com.qniao.framework.utils.PageUtil; import org.springframework.stereotype.Service; @@ -74,4 +76,9 @@ public class OrderQueryServiceImpl implements OrderQueryService { } return flag; } + + @Override + public QnPage userUserOrderRecord(PageUtil pageUtil, Long miId, Long userId, Long orgId) { + return PageUtil.convert(orderViewDao.userUserOrderRecord(pageUtil.toPageWithoutOrders(),miId,userId)); + } } diff --git a/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml b/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml index 03cab09..5fa3d07 100644 --- a/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml +++ b/dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml @@ -62,4 +62,21 @@ and dao.status = #{queryParam.status} + +