管理端订单列表新增支付开始时间、支付结束时间查询条件

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

@@ -46,8 +46,9 @@ public class OrderController extends AbstractController {
     @GetMapping(value = "selectAllOrderAdmin")
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber,
-                                      @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType, String shopName, String riderPhone, String startTime, String endTime){
-        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType,shopName,riderPhone,startTime,endTime);
+                                      @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
+                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime){
+        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime, payStartTime, payEndTime);
     }
 
     @GetMapping("excelOrder")

src/main/java/com/sqx/modules/order/dao/AppOrderDao.java

@@ -27,7 +27,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
     IPage<TbOrder> selectAllOrderAdmin(Page<TbOrder> pages,@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                @Param("userName") String userName, @Param("orderNumber") String orderNumber,@Param("orderType") Integer orderType,
                                        @Param("shopName")String shopName,@Param("riderPhone") String riderPhone,
-                                       @Param("startTime") String startTime,@Param("endTime") String endTime);
+                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime);
 
     List<TbOrder> excelAllOrderAdmin(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                        @Param("userName") String userName, @Param("orderNumber") String orderNumber,

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -31,7 +31,7 @@ public interface AppOrderService extends IService<TbOrder> {
     Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType,String shopName);
 
     Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                               String orderNumber, Integer orderType,String shopName,String riderPhone, String startTime, String endTime);
+                               String orderNumber, Integer orderType,String shopName,String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime);
 
     ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                  String userName, String orderNumber, Integer orderType, String shopName,

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

@@ -1237,10 +1237,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
 
     @Override
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                                      String orderNumber, Integer orderType, String shopName, String riderPhone,String startTime,String endTime) {
+                                      String orderNumber, Integer orderType, String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
         Page<TbOrder> pages = new Page<>(page, limit);
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, status, phone, shopId, userName, orderNumber,
-                orderType, shopName, riderPhone,startTime,endTime);
+                orderType, shopName, riderPhone,startTime,endTime, payStartTime, payEndTime);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
                     .eq("order_id", tbOrderIPage.getRecords().get(i).getOrderId()));

src/main/resources/mapper/errand/TbIndentMapper.xml

@@ -71,7 +71,7 @@
             </if>
         </where>
         group by
-            shop_id
+            shop_id, shop_name
         order by
             distancess asc
     </select>
@@ -133,7 +133,7 @@
             and shop_id = #{queryDTO.shopId}
         </if>
         group by
-            shop_id
+            shop_id, shop_name, shop_lng, shop_lat
         order by
             distancess asc
     </select>

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

@@ -126,6 +126,12 @@
         <if test="endTime!=null and endTime!='' ">
             and date_format(tor.create_time,'%Y-%m-%d') &lt;= date_format(#{endTime},'%Y-%m-%d')
         </if>
+        <if test="payStartTime != null and payStartTime != ''">
+            and date_format(tor.pay_time,'%Y-%m-%d') >= date_format(#{payStartTime},'%Y-%m-%d')
+        </if>
+        <if test="payEndTime != null and payEndTime != '' ">
+            and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{payEndTime},'%Y-%m-%d')
+        </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>