更新代码

puzhibing

2023-06-02 05e0c51caadfe0940f7fe3756ed2ba8d26f93765

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java

@@ -151,13 +151,20 @@

        // 查询用户
        TAppUser tAppUser = tAppUserMapper.selectById(tOrder.getUserId());
        model.addAttribute("userName",tAppUser.getNickname());
        model.addAttribute("userPhone",tAppUser.getPhone());
        model.addAttribute("havDiscount",tAppUser.getHavDiscount());
        if(1 == tAppUser.getHavDiscount()){
            // 计算9折优惠金额
            BigDecimal multiply = tOrder.getOrderMoney().multiply(new BigDecimal("0.1")).setScale(2);
            model.addAttribute("multiply",multiply);
        if(null != tAppUser){
            model.addAttribute("userName",tAppUser.getNickname());
            model.addAttribute("userPhone",tAppUser.getPhone());
            model.addAttribute("havDiscount",tAppUser.getHavDiscount());
            if(1 == tAppUser.getHavDiscount()){
                // 计算9折优惠金额
                BigDecimal multiply = tOrder.getOrderMoney().multiply(new BigDecimal("0.1")).setScale(2);
                model.addAttribute("multiply",multiply);
            }
        }else{
            model.addAttribute("userName",tOrder.getUserName());
            model.addAttribute("userPhone",tOrder.getUserPhone());
            model.addAttribute("havDiscount", 0);
            model.addAttribute("multiply",0D);
        }

        // 查询司机
@@ -428,9 +435,16 @@
            tOrder.setEndLat(jsonObject.getString("lat"));
            tOrder.setEndLng(jsonObject.getString("lon"));
        }
        if(ToolUtil.isEmpty(tOrder.getStartLng()) || ToolUtil.isEmpty(tOrder.getStartLat())){
            return ResultUtil.error("请输入有效的起点");
        }

        tOrder.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
        Double d = 0D;
        if(ToolUtil.isNotEmpty(endAddress)){
            if(ToolUtil.isEmpty(tOrder.getEndLng()) || ToolUtil.isEmpty(tOrder.getEndLat())){
                return ResultUtil.error("请输入有效的终点");
            }
            Map<String, String> distance = MapUtil.getDistance(tOrder.getStartLng() + "," + tOrder.getStartLat(), tOrder.getEndLng() + "," + tOrder.getEndLat(), 1);
            if(null == distance){
                return ResultUtil.error("获取预估距离出错", "");