From c96b05ab329834d16ec2aad7a35e66dfa02511c1 Mon Sep 17 00:00:00 2001 From: jiaosong <jiaosong6760@dingtalk.com> Date: 星期三, 18 十月 2023 11:40:34 +0800 Subject: [PATCH] #获取正常还车 --- server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java index 85a1fb7..4716129 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java @@ -90,12 +90,12 @@ return pricingDetail.getId(); } - private String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) { - String title = ""; + public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) { + String title = "璁¤垂瑙勫垯锛�"; if(baseTime < 0){ - title = "瑙勫垯锛�"+Constants.translateMoney(basePrice).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ"; + title = Constants.translateMoney(basePrice).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ"; }else { - title = "瑙勫垯锛氳捣姝�"; + title = "璧锋"; int time = baseTime / 60; int min = baseTime % 60; if(time > 0){ @@ -230,6 +230,7 @@ put.setBikeTypeId(s.getId()); put.setPricePramId(pricingDetail.getPricePramId()); put.setBikeTypeName(s.getName()); + put.setSortnum(s.getSortnum()); put.setBasePrice(Objects.nonNull(put.getBasePrice()) ? Constants.translateMoney(put.getBasePrice()) : null); put.setHolidayBasePrice(Objects.nonNull(put.getHolidayBasePrice()) ? Constants.translateMoney(put.getHolidayBasePrice()):null); put.setUnitPrice(Objects.nonNull(put.getUnitPrice()) ? Constants.translateMoney(put.getUnitPrice()):null); -- Gitblit v1.9.3