盲票订单增加订单状态

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserTicketOrderMgrController.java

@@ -65,13 +65,13 @@ public class UserTicketOrderMgrController extends BaseApiController {
         if (StringUtils.isNotBlank(userTicketOrderQueryParam.getPhone())) {
             queryWrapper.eq("t2.phonenumber", userTicketOrderQueryParam.getPhone());
         }
+        if (Objects.nonNull(userTicketOrderQueryParam.getStatus())) {
+            queryWrapper.eq("t1.status", userTicketOrderQueryParam.getStatus());
+        }
         if (Objects.nonNull(userTicketOrderQueryParam.getStartTime()) && Objects.nonNull(userTicketOrderQueryParam.getEndTime())) {
             queryWrapper.between("t1.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
         }
 
-        // 只展示支付成功的订单
-        queryWrapper.eq("t1.status", UserTicketOrderStatusEnum.FINISHED);
-
         queryWrapper.orderByDesc("t1.created_time");
 
         List<UserTicketOrderListVO> list = userTicketOrderService.listUserTicketOrder(queryWrapper);
@@ -104,11 +104,12 @@ public class UserTicketOrderMgrController extends BaseApiController {
         if (StringUtils.isNotBlank(userTicketOrderQueryParam.getPhone())) {
             queryWrapper.eq("t2.phonenumber", userTicketOrderQueryParam.getPhone());
         }
+        if (Objects.nonNull(userTicketOrderQueryParam.getStatus())) {
+            queryWrapper.eq("t1.status", userTicketOrderQueryParam.getStatus());
+        }
         if (Objects.nonNull(userTicketOrderQueryParam.getStartTime()) && Objects.nonNull(userTicketOrderQueryParam.getEndTime())) {
             queryWrapper.between("t1.created_time", userTicketOrderQueryParam.getStartTime(), userTicketOrderQueryParam.getEndTime());
         }
-        // 只展示支付成功的订单
-        queryWrapper.eq("t1.status", UserTicketOrderStatusEnum.FINISHED);
         queryWrapper.orderByDesc("t1.created_time");
         int totalSize = userTicketOrderService.countUserTicketOrder(queryWrapper);
         if (totalSize == 0) {
@@ -131,6 +132,9 @@ public class UserTicketOrderMgrController extends BaseApiController {
         List<UserTicketOrderExcel> excelList = userTicketOrderListVOList.stream().map(userTicketOrderListVO -> {
             UserTicketOrderExcel userTicketOrderExcel = new UserTicketOrderExcel();
             BeanUtils.copyProperties(userTicketOrderListVO, userTicketOrderExcel);
+            if (Objects.nonNull(userTicketOrderListVO.getStatus())) {
+                userTicketOrderExcel.setStatus(userTicketOrderListVO.getStatus().getDesc());
+            }
             if (Objects.nonNull(userTicketOrderListVO.getBoxType())){
                 userTicketOrderExcel.setBoxType(userTicketOrderListVO.getBoxType().getDesc());
             }

mp-common/src/main/java/com/qs/mp/common/enums/UserTicketOrderStatusEnum.java

@@ -29,6 +29,10 @@ public enum UserTicketOrderStatusEnum implements IEnum<Integer> {
     return value;
   }
 
+  public String getDesc() {
+    return desc;
+  }
+
   /**
    * 重写toString，单个转化成json
    * @return

mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderExcel.java

@@ -37,13 +37,15 @@ public class UserTicketOrderExcel {
     @Excel(name = "购买数量")
     private Integer ticketNum;
 
+    @Excel(name = "订单状态")
+    private String status;
+
     @Excel(name = "优惠金额")
     private Integer discountAmt;
 
     @Excel(name = "实付金额")
     private Integer payAmt;
 
-
     @Excel(name = "用户昵称")
     private String nickName;
 

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserTicketOrderQueryParam.java

@@ -2,7 +2,9 @@ package com.qs.mp.admin.domain.param;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.common.enums.TicketTypeEnum;
+import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,6 +30,10 @@ public class UserTicketOrderQueryParam {
     @ApiModelProperty("用户手机号")
     private String phone;
 
+    @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private UserTicketOrderStatusEnum status;
+
     @ApiModelProperty("开始时间")
     private Date startTime;
 

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderDetailVO.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.common.enums.TicketTypeEnum;
+import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -24,6 +25,10 @@ public class UserTicketOrderDetailVO {
     @ApiModelProperty("订单id")
     private String orderId;
 
+    @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private UserTicketOrderStatusEnum status;
+
     @ApiModelProperty("优惠金额")
     private Integer discountAmt;
 

mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderListVO.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qs.mp.common.enums.TicketTypeEnum;
+import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +28,10 @@ public class UserTicketOrderListVO {
     @ApiModelProperty("盲票组名称")
     private String title;
 
+    @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:已完成")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private UserTicketOrderStatusEnum status;
+
     @ApiModelProperty("盲票销售价格")
     private Integer salePrice;
 

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -135,6 +135,7 @@
     <select id="listUserTicketOrder" resultType="com.qs.mp.admin.domain.vo.UserTicketOrderListVO">
 		select t1.order_id,
 				t1.created_time,
+				t1.status,
 				t1.title,
 				t1.sale_price,
 				t1.pay_amt,
@@ -152,6 +153,7 @@
     <select id="selectUserTicketOrderDetail" resultType="com.qs.mp.admin.domain.vo.UserTicketOrderDetailVO">
 		select t1.order_id,
 				t1.discount_amt,
+				t1.status,
 				t1.title ticketBoxTitle,
 				t1.sale_comm_rate,
 				t1.sale_price,