From cc3bbf14c5fde619c23e5502c8583889e94deacc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 25 十月 2023 09:58:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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..14e19aa 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 = (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
         }else {
-            title = "瑙勫垯锛氳捣姝�";
+            title = "璧锋";
             int time = baseTime / 60;
             int min = baseTime % 60;
             if(time > 0){
@@ -104,8 +104,8 @@
             if(min >0){
                 title += min+"鍒嗛挓";
             }
-            title = Constants.translateMoney(unitPrice).doubleValue()
-                    +"鍏冿紝瓒呰繃鍚�"+Constants.translateMoney(basePrice).doubleValue()+"鍏�/"
+            title += basePrice.doubleValue()
+                    +"鍏冿紝瓒呰繃鍚�"+unitPrice.doubleValue()+"鍏�/"
                     +unitTime+"鍒嗛挓";
         }
         return  title;
@@ -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