Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!481

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

@@ -10,6 +10,8 @@ import com.qs.mp.common.annotation.Log;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
+import com.qs.mp.common.enums.PayOrderStatusEnum;
+import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
@@ -66,6 +68,10 @@ public class UserTicketOrderMgrController extends BaseApiController {
         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);
@@ -101,6 +107,8 @@ public class UserTicketOrderMgrController extends BaseApiController {
         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) {