Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSav...

puzhibing

2023-08-17 d0c88e9f82a73e225ec04f3f8b533cf1d97028bc

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -996,8 +996,10 @@
                    order.setStartTime(new Date());
                }
                //计算等待用户时长
                Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
                order.setWaitTime(order.getWaitTime() + w);
                if(null != order.getStartWaitTime()){
                    Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
                    order.setWaitTime(order.getWaitTime() + w);
                }
                order.setStartWaitTime(null);
                orderPositionService.initMap(order.getId());
                break;