管理端订单列表新增骑手接单时间字段

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -9,14 +9,10 @@ import com.sqx.modules.order.service.AppOrderService;
 import com.sqx.modules.order.service.EvaluateRiderService;
 import com.sqx.modules.order.service.EvaluateService;
 import com.sqx.modules.sys.controller.AbstractController;
-import com.sqx.modules.utils.excel.ExcelData;
-import com.sqx.modules.utils.excel.ExportExcelUtils;
 import icu.xuyijie.secureapi.annotation.DecryptParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 @Slf4j
@@ -50,7 +45,7 @@ public class OrderController extends AbstractController {
 
     @ApiOperation("条件查询所有订单(管理端)")
     @GetMapping(value = "selectAllOrderAdmin")
-    public Result selectAllOrderAdmin(OrderQueryDto queryDto) {
+    public Result selectAllOrderAdmin(@Valid OrderQueryDto queryDto) {
         return appOrderService.selectAllOrderAdmin(queryDto);
     }
 

src/main/java/com/sqx/modules/order/dto/OrderQueryDto.java

@@ -2,9 +2,10 @@ package com.sqx.modules.order.dto;
 
 import com.sqx.common.query.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.validation.constraints.Pattern;
+
 @Data
 public class OrderQueryDto extends PageQuery {
 
@@ -35,8 +36,10 @@ public class OrderQueryDto extends PageQuery {
     private String startTime;
     @ApiModelProperty("订单创建结束时间")
     private String endTime;
+    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$", message = "订单支付查询开始时间格式必须为yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("订单支付开始时间")
     private String payStartTime;
+    @Pattern(regexp = "^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}$", message = "订单支付查询结束时间格式必须为yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("订单支付结束时间")
     private String payEndTime;
     @ApiModelProperty("骑手站点id")

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1412,15 +1412,15 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         if (org.springframework.util.StringUtils.hasText(queryDto.getEndTime())) {
             queryDto.setEndTime(queryDto.getEndTime() + " 23:59:59");
         }
-        if (org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())) {
-            queryDto.setPayEndTime(queryDto.getPayEndTime() + " 23:59:59");
-        }
+        // if (org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())) {
+        //     queryDto.setPayEndTime(queryDto.getPayEndTime() + " 23:59:59");
+        // }
         if (org.springframework.util.StringUtils.hasText(queryDto.getStartTime())) {
             queryDto.setStartTime(queryDto.getStartTime() + " 00:00:00");
         }
-        if (org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())) {
-            queryDto.setPayStartTime(queryDto.getPayStartTime() + " 00:00:00");
-        }
+        // if (org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())) {
+        //     queryDto.setPayStartTime(queryDto.getPayStartTime() + " 00:00:00");
+        // }
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, queryDto);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
@@ -1436,15 +1436,15 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         if (org.springframework.util.StringUtils.hasText(queryDto.getEndTime())) {
             queryDto.setEndTime(queryDto.getEndTime() + " 23:59:59");
         }
-        if (org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())) {
-            queryDto.setPayEndTime(queryDto.getPayEndTime() + " 23:59:59");
-        }
+        // if (org.springframework.util.StringUtils.hasText(queryDto.getPayEndTime())) {
+        //     queryDto.setPayEndTime(queryDto.getPayEndTime() + " 23:59:59");
+        // }
         if (org.springframework.util.StringUtils.hasText(queryDto.getStartTime())) {
             queryDto.setStartTime(queryDto.getStartTime() + " 00:00:00");
         }
-        if (org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())) {
-            queryDto.setPayStartTime(queryDto.getPayStartTime() + " 00:00:00");
-        }
+        // if (org.springframework.util.StringUtils.hasText(queryDto.getPayStartTime())) {
+        //     queryDto.setPayStartTime(queryDto.getPayStartTime() + " 00:00:00");
+        // }
         List<TbOrder> tbOrderIPage = appOrderDao.excelAllOrderAdmin(queryDto);
 //        for (int i = 0; i < tbOrderIPage.size(); i++) {
 //            List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
@@ -1463,6 +1463,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         titles.add("配送信息");
         titles.add("骑手昵称");
         titles.add("骑手电话");
+        titles.add("骑手接单时间");
         titles.add("订单号");
         titles.add("内容");
         titles.add("商品总价（元）");
@@ -1516,6 +1517,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             }
             row.add(order.getRiderNickName());
             row.add(order.getRiderPhone());
+            row.add(order.getReceivingTime());
             row.add(order.getOrderNumber());
 //            stringBuffer=new StringBuffer();
 //            BigDecimal sumGoodsPrice=BigDecimal.ZERO;

src/main/resources/mapper/order/OrderMapper.xml

@@ -89,7 +89,7 @@
     <select id="selectAllOrderAdmin" resultType="com.sqx.modules.order.entity.TbOrder">
         select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
         shopPhone,
-        tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
+        tiu.user_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,ti.receiving_time,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
         apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,
         (select station_name from rider_station where id = tiu.rider_station_id ) as stationName,
@@ -195,7 +195,7 @@
     <select id="excelAllOrderAdmin" resultType="com.sqx.modules.order.entity.TbOrder">
         select tor.*, tu.avatar as avatar, gs.shop_name as shopName, gs.detailed_address as detailedAddress, gs.phone as
         shopPhone,
-        tiu.nick_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
+        tiu.nick_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,ti.receiving_time,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
         apr.discount_amount as activityDiscountAmount, ai.title activityTitle,ogg.detail,ogg.sumPrice,
         (select rs.station_name from rider_station rs where rs.id =tiu.rider_station_id ) as stationName,