From c4af2be6090d6572d823ddea18d2b8bde78a0993 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 19 七月 2023 15:09:05 +0800
Subject: [PATCH] 处理用户端重复点击下单

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index b80e7dc..9d5d489 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -684,6 +684,7 @@
         pageNum = (pageNum - 1) * pageSize;
         String value = redisUtil.getValue("DRIVER" + uid);
         List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
+        List<HallOrderList> lists = new ArrayList<>();
         hallOrderLists.forEach(hallOrderList -> {
             if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
                 hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
@@ -693,11 +694,17 @@
                 Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
                 Double wgs84 = distance.get("WGS84");
                 hallOrderList.setCurrentDistance(wgs84);
+
+                if(wgs84 > 5000){
+                    return;
+                }
             }else{
                 hallOrderList.setCurrentDistance(0D);
+                return;
             }
+            lists.add(hallOrderList);
         });
-        return hallOrderLists;
+        return lists;
     }
 
 
@@ -1403,15 +1410,14 @@
             new Timer().schedule(new TimerTask() {
                 @Override
                 public void run() {
-                    Order order1 = OrderServiceImpl.this.selectById(orderId);
-                    if(order1.getState() == 107){
-                        completeCollection_(order1);
+                    try {
+                        OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
+                    }catch (Exception e){
+                        e.printStackTrace();
                     }
                 }
             }, 60000);
         }
-
-
         return ResultUtil.success();
     }
 

--
Gitblit v1.7.1