xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpOperationsUserController.java
@@ -262,16 +262,17 @@ XpOperationsUserVO xpOperationsUserVO = xpOperationsUserService.detailById(id); if (xpOperationsUserVO.getAvatar() != null) { JSONObject jsonObject = JSONObject.parseObject(xpOperationsUserVO.getAvatar()); String downloadUrl = null; try { // 1 String downloadUrl1 = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); downloadUrl = downloadUrl1; } catch (Exception e) { e.printStackTrace(); if(jsonObject!=null){ String downloadUrl = null; try { // 1 downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (Exception e) { e.printStackTrace(); } jsonObject.put("url", downloadUrl); xpOperationsUserVO.setAvatar(jsonObject.toJSONString()); } jsonObject.put("url", downloadUrl); xpOperationsUserVO.setAvatar(jsonObject.toJSONString()); } return R.ok(xpOperationsUserVO); xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/utils/XpPricingUtil.java
@@ -89,7 +89,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4); @@ -140,8 +140,8 @@ xpPricingCardVo.setDurationPrice(durationPrice); xpPricingCardVo.setTotalPrice(new BigDecimal(startPrice + distancePrice + durationPrice).setScale(2,RoundingMode.HALF_UP).doubleValue()); // 里程 xpPricingCardVo.setDistance(realDistance); xpPricingCardVo.setDuration(realTime); xpPricingCardVo.setDistance(realDistance*1000); xpPricingCardVo.setDuration(realTime*60); return xpPricingCardVo; } @@ -180,7 +180,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4); @@ -361,6 +361,9 @@ // 时长费 xpPricingCardVo.setDurationPrice((exceedTime * rule.getDouble("num17"))); xpPricingCardVo.setDistancePriceNormal(rule.getDouble("num2")*1000); xpPricingCardVo.setDurationPriceNormal(rule.getDouble("num3")*60); } else { @@ -423,6 +426,9 @@ xpPricingCardVo.setTime(rule.getString("num22")); } xpPricingCardVo.setDistancePriceNormal(rule.getDouble("num2")*1000); xpPricingCardVo.setDurationPriceNormal(rule.getDouble("num3")*60); // 里程 xpPricingCardVo.setDistance(realDistance); @@ -502,6 +508,7 @@ amount=new BigDecimal(amount).setScale(2,RoundingMode.HALF_UP).doubleValue(); // 先减去起步价重新计算 amount = amount - startPrice; // 动态计算费用 startPrice= new BigDecimal(startPrice).multiply(new BigDecimal(priceRate)).setScale(2, RoundingMode.HALF_UP).doubleValue(); amount = amount+startPrice; @@ -510,6 +517,8 @@ xpPricingCardVo.setDistance(xpPricingCardVo.getDistance()*1000); xpPricingCardVo.setDuration(xpPricingCardVo.getDuration()*60); return xpPricingCardVo; xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPricingController.java
@@ -85,7 +85,7 @@ @GetMapping("/base/v1/mini-program/pricing/rules/{openCityId}") @ApiOperation(value = "获取费用规则(弃用)", tags = {"小程序-根据开通城市获取费用规则(弃用)"}, response = String.class) public R<?> getPricingRules(@PathVariable Long openCityId) { XpPricing xpPricing = xpPricingService.getOne(new LambdaQueryWrapper<XpPricing>().eq(XpPricing::getCityId, openCityId).eq(XpPricing::getPricingType, 1).last("limit 1")); XpPricing xpPricing = xpPricingService.getOne(new LambdaQueryWrapper<XpPricing>().eq(XpPricing::getCityId, openCityId).last("limit 1")); if (xpPricing != null) { return R.ok(xpPricing.getPriceRule()); } xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/XpPricingUtil.java
@@ -87,7 +87,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4); @@ -178,7 +178,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -2887,16 +2887,16 @@ XpPoint endPoint = xpPointR1.getData(); xpOrderDetailVO.setEndParkingTimeLimit(endPoint.getParkingTimeLimit()); } // 算时间 if (xpOrder.getStatus() == 1) { R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat())); if (r.getCode() == R.SUCCESS) { xpOrderDetailVO.setEstimatedTime(r.getData()); } else { throw new RuntimeException(r.getMsg()); } } // // 算时间 // if (xpOrder.getStatus() == 1) { // R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat())); // if (r.getCode() == R.SUCCESS) { // xpOrderDetailVO.setEstimatedTime(r.getData()); // } else { // throw new RuntimeException(r.getMsg()); // } // // } if (xpOrder.getVehicleId() != null) { R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(xpOrder.getVehicleId()); xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/XpPricingUtil.java
@@ -88,7 +88,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4); @@ -179,7 +179,7 @@ String timeStr = dynamicPriceObj.toString(); // 判断当前距离这个时间范围的新增订单数（排除取消） / 上浮数量 算出应该增加的价格率 R<Integer> r = xpOrderClient.getOrderNum(new GetOrderNumDto(timeStr,openCityId)); if(r.getData()==200){ if(r.getCode()==200){ int num = r.getData(); // X单上升一次调价 Integer orderNum = getOrderNum(jsonObject, 4);
