Merge remote-tracking branch 'origin/1.1' into 1.1

puzhibing

2023-07-20 e8ce24f3a378d1fdb5c1c9e6fbecb067aa22cdd9

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

@@ -420,18 +420,6 @@
            return ResultUtil.error("您还有正在进行的订单");
        }

        String value = redisUtil.getValue("USER" + uid);
        if(ToolUtil.isEmpty(value)){
            redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
        }else{
            Long s = System.currentTimeMillis() - Long.valueOf(value);
            if(s.compareTo(60000L) < 0){//1分钟
                return ResultUtil.error("数据处理中");
            }
            redisUtil.setStrValue("USER" + uid, System.currentTimeMillis() + "", 60);
        }


        String startAddress = travelOrder.getStartAddress();
        startAddress = startAddress.replaceAll("& #40;", "(");
        startAddress = startAddress.replaceAll("& #41;", ")");
@@ -844,6 +832,12 @@
    @Override
    public ResultUtil editOrderEndAddress(Integer uid, EditOrderEndAddress editOrderEndAddress) throws Exception {
        Order order = this.selectById(editOrderEndAddress.getOrderId());

        String endAddress = editOrderEndAddress.getEndAddress();
        endAddress = endAddress.replaceAll("& #40;", "(");
        endAddress = endAddress.replaceAll("& #41;", ")");
        editOrderEndAddress.setEndAddress(endAddress);

        order.setEndAddress(editOrderEndAddress.getEndAddress());
        order.setEndLat(editOrderEndAddress.getEndLat().toString());
        order.setEndLng(editOrderEndAddress.getEndLng().toString());