订单列表分页

lb-app/src/main/java/com/ydd/app/controller/OrderApi.java

@@ -229,7 +229,8 @@ public class OrderApi extends BaseController {
             memberIds.addAll(shopMemberIds);
         }
         startPage();
-        return BaseResult.success(new PageResult(apiOrderDetailService.findList(memberIds, status, searchKey, shopId, startDate, endDate,city,deliveryId,type)));
+        PageResult pageList = apiOrderDetailService.findList(memberIds, status, searchKey, shopId, startDate, endDate,city,deliveryId,type);
+        return BaseResult.success(pageList);
     }
 
     /**

lb-app/src/main/java/com/ydd/app/service/ApiOrderDetailService.java

@@ -3,6 +3,7 @@ package com.ydd.app.service;
 import com.ydd.app.dto.OrderMarkerDto;
 import com.ydd.app.dto.OrderReq;
 import com.ydd.app.dto.ValuationRes;
+import com.ydd.common.core.page.PageResult;
 import com.ydd.module.domain.Member;
 import com.ydd.module.domain.Order;
 import com.ydd.module.domain.OrderLog;
@@ -25,8 +26,8 @@ public interface ApiOrderDetailService {
 
 
 
-    List<OrderDto> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId, String startDate, String endDate,
-                         String city, Integer deliveryId, Integer type);
+    PageResult findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId, String startDate, String endDate,
+                        String city, Integer deliveryId, Integer type);
 
     OrderDto findDetail(Long loginId, Integer orderId,String version);
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiMemberServiceImpl.java

@@ -908,13 +908,13 @@ public class ApiMemberServiceImpl implements ApiMemberService {
         Page<MemberBalanceLogDto> pageResult = iMemberBalanceLogService.getBalanceLogList(request, loginId, shopIdList, new Page<>(request.getPageNum(), request.getPageSize()));
         List<MemberBalanceLogDto> list = pageResult.getRecords();
         list.forEach(memberBalanceLog -> {
-            Member shopMember = iMemberService.getById(memberBalanceLog.getMemberId());
-            if (shopMember != null) {
-               //String shopName = iShopService.getShopNameById(shopMember.getShopId());
-                Shop shop = iShopService.getById(shopMember.getShopId());
-                memberBalanceLog.setShopName(shop.getName());
-                memberBalanceLog.setCityName(shop.getCityName());
-            }
+//            Member shopMember = iMemberService.getById(memberBalanceLog.getMemberId());
+//            if (shopMember != null) {
+//               //String shopName = iShopService.getShopNameById(shopMember.getShopId());
+//                Shop shop = iShopService.getById(shopMember.getShopId());
+//                memberBalanceLog.setShopName(shop.getName());
+//                memberBalanceLog.setCityName(shop.getCityName());
+//            }
             if (memberBalanceLog.getOrderSn() != null && memberBalanceLog.getWaimaiOrderId() == null) {
                 memberBalanceLog.setOrderType(99);
             }

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderDetailServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydd.app.service.ApiOrderDetailService;
 import com.ydd.app.service.ApiRiderLocationService;
+import com.ydd.common.core.page.PageResult;
 import com.ydd.common.enums.DeliveryTypeEnums;
 import com.ydd.module.domain.*;
 import com.ydd.module.dto.MemberConfigDto;
@@ -64,8 +65,9 @@ public class ApiOrderDetailServiceImpl implements ApiOrderDetailService {
     private final IWaimaiFoodImgService iWaimaiFoodImgService;
 
     @Override
-    public List<OrderDto> findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId,String startDate,String endDate, String city, Integer deliveryId, Integer type) {
+    public PageResult findList(List<Long> memberIds, Integer status, String searchKey, Integer shopId,String startDate,String endDate, String city, Integer deliveryId, Integer type) {
         List<Order> list = iOrderService.findList(memberIds, status, searchKey,shopId,startDate,endDate,city,deliveryId,type);
+        PageResult  page = new PageResult(list);
         List<OrderDto> orderDtoList = new ArrayList<>();
         for (Order order : list) {
 //            List<OrderLog> logs = iOrderLogService.list(new QueryWrapper<OrderLog>().eq("order_status", DeliveryStatusEnum.IN_DELIVERY.status).eq("order_id", order.getId()));
@@ -102,7 +104,8 @@ public class ApiOrderDetailServiceImpl implements ApiOrderDetailService {
             this.setOrderInfoTime(dto);
             orderDtoList.add(dto);
         }
-        return orderDtoList;
+        page.setData(orderDtoList);
+        return page;
     }
 
     @Override

lb-module/src/main/resources/mapper/module/memberBalanceLogMapper.xml

@@ -206,11 +206,14 @@
         lo.order_sn,
         lwo.out_order_id,
         lwo.order_type,
-        lo.waimai_order_id
+        lo.waimai_order_id,
+        s.`name` shopName,
+        s.city_name cityName
         FROM lb_member_balance_log ml
         LEFT JOIN lb_member m ON ml.member_id = m.id
         LEFT JOIN lb_order lo ON ml.order_id = lo.id
         LEFT JOIN lb_waimai_order lwo ON lo.waimai_order_id = lwo.id
+        LEFT JOIN lb_shop s on lo.shop_id = s.id
         WHERE ml.deleted = 0
         <if test="params.memberType != 1 and shopIdList != null and shopIdList.size > 0">
             AND ml.member_id IN
@@ -242,7 +245,7 @@
             AND lo.order_sn  like concat('%', #{params.orderSn}, '%')
         </if>
         <if test="params.cityName != null and params.cityName != ''">
-            AND lo.send_city_name like concat('%', #{params.cityName}, '%')
+            AND s.city_name  like concat('%', #{params.cityName}, '%')
         </if>
         <if test="params.orderType != null">
             <if test="params.orderType != 0 and params.orderType != 99">

lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -709,13 +709,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (receipt_address like concat('%', #{searchKey}, '%') or order_sn like concat('%', #{searchKey}, '%'))
         </if>
         <if test="type ==1 and  searchKey != null and searchKey != ''">
-            AND  order_sn like concat('%', #{searchKey}, '%'))
+            AND  order_sn like concat('%', #{searchKey}, '%')
         </if>
         <if test="type ==2 and  searchKey != null and searchKey != ''">
-            AND  out_order_sn like concat('%', #{searchKey}, '%'))
+            AND  out_order_sn like concat('%', #{searchKey}, '%')
         </if>
         <if test="type ==3 and searchKey != null and searchKey != ''">
-            AND  receipt_phone like concat('%', #{searchKey}, '%'))
+            AND  receipt_phone like concat('%', #{searchKey}, '%')
         </if>
         <if test="shopId != null ">
             AND shop_id = #{shopId}