diff --git a/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderStatusEnum.java b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderStatusEnum.java new file mode 100644 index 0000000..c033867 --- /dev/null +++ b/dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderStatusEnum.java @@ -0,0 +1,44 @@ +package com.qniao.dam.domian.aggregate.order.constant; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonValue; +import lombok.Getter; + +@Getter +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum OrderStatusEnum { + + UNPAID(1, "待付款"), + + WAITING_TO_SHIP(2, "待发货"), + + SHIPPING(3, "发货中"), + + SHIPPED(4, "待收货"), + + COMPLETED(5, "已完成"), + + CANCELED(6, "已取消"); + + @EnumValue + @JsonValue + private final Integer value; + private final String desc; + + OrderStatusEnum(Integer value, String desc) { + this.value = value; + this.desc = desc; + } + + @JsonCreator + public static OrderStatusEnum get(Object code) { + for (OrderStatusEnum e : OrderStatusEnum.values()) { + if (e.getValue().equals(code)) { + return e; + } + } + return null; + } +} \ No newline at end of file diff --git a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java index 4edb9d9..308cb69 100644 --- a/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java +++ b/dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java @@ -1,6 +1,7 @@ package com.qniao.dam.domain.aggregate.order.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.qniao.dam.domian.aggregate.order.constant.OrderStatusEnum; import com.qniao.domain.Entity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,7 +32,7 @@ public class Order extends Entity { private LocalDateTime paidTime; @ApiModelProperty("状态") - private Integer status; + private OrderStatusEnum status; private transient List orderItemList; } 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 d7226a3..eab66f3 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 @@ -3,6 +3,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.UserPageOrderByOperatorVo; +import com.qniao.dam.domian.aggregate.order.constant.OrderStatusEnum; import com.qniao.dam.query.order.OrderQueryService; import com.qniao.dau.infrastructure.constant.RequestHeaderFields; import com.qniao.domain.QnPage; @@ -27,6 +28,7 @@ public class OrderUserQueryController { UserPageOrderByOperatorQueryParam queryParam, @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) { + queryParam.setStatus(OrderStatusEnum.COMPLETED.getValue()); return PageUtil.convert(orderQueryService.pageOrderByOperator(pageUtil, queryParam), UserPageOrderByOperatorVo.class); } @@ -35,6 +37,7 @@ public class OrderUserQueryController { public GetOrderStatisticsByOperatorVo userGetOrderStatisticsByOperator(UserPageOrderByOperatorQueryParam queryParam, @RequestParam("userId") Long userId, @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) { + queryParam.setStatus(OrderStatusEnum.COMPLETED.getValue()); return orderQueryService.getOrderStatisticsByOperator(queryParam); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java index a571d2f..3f03997 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/request/UserPageOrderByOperatorQueryParam.java @@ -20,5 +20,7 @@ public class UserPageOrderByOperatorQueryParam { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime orderTimeTo; + @ApiModelProperty("状态") + private Integer status; } 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 c01c07f..03cab09 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 @@ -24,6 +24,9 @@ and dao.create_time BETWEEN #{queryParam.orderTimeFrom} and #{queryParam.orderTimeTo} + + and dao.status = #{queryParam.status} + ORDER BY dao.create_time desc @@ -55,5 +58,8 @@ and dao.create_time BETWEEN #{queryParam.orderTimeFrom} and #{queryParam.orderTimeTo} + + and dao.status = #{queryParam.status} +