基础配置

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;
+    }
+}

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<Order> {
     private LocalDateTime paidTime;
 
     @ApiModelProperty("状态")
-    private Integer status;
+    private OrderStatusEnum status;
 
     private transient List<OrderItem> orderItemList;
 }

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);
     }
 

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;
 
 }

dating-agency-mall-server/src/main/resources/mapper/order/OrderViewMapper.xml

@@ -24,6 +24,9 @@
         <if test="queryParam.orderTimeFrom != null and queryParam.orderTimeTo != null">
             and dao.create_time BETWEEN #{queryParam.orderTimeFrom} and #{queryParam.orderTimeTo}
         </if>
+        <if test="queryParam.status != null">
+            and dao.status = #{queryParam.status}
+        </if>
         ORDER BY dao.create_time desc
     </select>
 
@@ -55,5 +58,8 @@
         <if test="queryParam.orderTimeFrom != null and queryParam.orderTimeTo != null">
             and dao.create_time BETWEEN #{queryParam.orderTimeFrom} and #{queryParam.orderTimeTo}
         </if>
+        <if test="queryParam.status != null">
+            and dao.status = #{queryParam.status}
+        </if>
     </select>
 </mapper>