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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java

@@ -93,9 +93,9 @@
    public static  String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
        String title = "计费规则：";
        if(baseTime < 0){
            title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
            title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"元畅骑一整天";
        }else {
            title = "起步";
            title += "起步";
            int time = baseTime / 60;
            int min = baseTime % 60;
            if(time > 0){
@@ -104,7 +104,7 @@
            if(min >0){
                title += min+"分钟";
            }
            title += basePrice.doubleValue()
            title += basePrice.divide(new BigDecimal(100)).doubleValue()
                    +"元，超过后"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"元/"
                    +unitTime+"分钟";
        }
@@ -123,6 +123,10 @@
            //参数错误
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()));
        pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()));
        pricingDetail.setUnitTime(Constants.formatIntegerNum(pricingDetail.getUnitTime()));
        pricingDetail.setHolidayUnitTime(Constants.formatIntegerNum(pricingDetail.getHolidayUnitTime()));
        if (  pricingDetail.getBaseTime() < 0){
            pricingDetail.setBaseTime(-1);
        }