Accept Merge Request #33: (dev-minio -> dev-测试环境分支不要从这拉代码)

Merge Request: 更新小程序外卖配送展示接口

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/33?initial=true

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

@@ -46,7 +46,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
 
     IPage<TbOrder> selectOrderDetails(Page<TbOrder> pages, Long userId);
 
-    IPage<TbOrder> waitTakeFood(Page<TbOrder> pages, Long userId, Integer orderType, Integer status);
+    IPage<TbOrder> waitTakeFood(Page<TbOrder> pages, Long userId, Integer orderType, Integer status,Integer isPay);
 
     int selectCountOrderByTime(@Param("payTime") String payTime, @Param("shopId") Long shopId);
 

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

@@ -1466,7 +1466,30 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public Result waitTakeFood(Long userId, Integer orderType, Integer page, Integer limit, Integer status) {
         Page<TbOrder> pages = new Page<>(page, limit);
-        IPage<TbOrder> tbOrderIPage = appOrderDao.waitTakeFood(pages, userId, orderType, status);
+        Integer isPay=1;
+        if (status==null) {
+            isPay=1;
+        }else if (status==0){
+            isPay=0;
+        }else if (status==1){
+            isPay=0;
+        }else if (status==2){
+            isPay=0;
+        }else if (status==3){
+            isPay=1;
+        }else if (status==4){
+            isPay=1;
+        }else if (status==5){
+            isPay=0;
+        }else if (status==6){
+            isPay=1;
+        }else if (status==7){
+            isPay=1;
+        }else if (status==8){
+            isPay=0;
+        }
+
+        IPage<TbOrder> tbOrderIPage = appOrderDao.waitTakeFood(pages, userId, orderType, status,isPay);
         List<TbOrder> records = tbOrderIPage.getRecords();
         int size = records.size();
         for (int i = 0; i < size; i++) {

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

@@ -400,7 +400,13 @@
         <if test="status==null">
             and tor.status in (0, 7, 6, 3, 4, 5, 8)
         </if>
-        order by tor.create_time desc
+        <if test="isPay==0">
+            order by tor.create_time desc
+        </if>
+        <if test="isPay==1">
+            order by tor.pay_time desc
+        </if>
+
     </select>