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

@@ -82,20 +82,20 @@
        insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
        insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
        insert.setInfo(pricingDetail.getInfo());
        String title = getRoleNameByParam(pricingDetail.getBasePrice(),pricingDetail.getBaseTime(),pricingDetail.getUnitPrice(),pricingDetail.getUnitTime());
        String info = getRoleNameByParam(pricingDetail.getHolidayBasePrice(),pricingDetail.getHolidayBaseTime(),pricingDetail.getHolidayUnitPrice(),pricingDetail.getHolidayUnitTime());;
        String title = getRoleNameByParam(insert.getBasePrice(),insert.getBaseTime(),insert.getUnitPrice(),insert.getUnitTime());
        String info = getRoleNameByParam(insert.getHolidayBasePrice(),insert.getHolidayBaseTime(),insert.getHolidayUnitPrice(),insert.getHolidayUnitTime());;
        insert.setTitle(title);//工作日计价配置规则
        insert.setInfo(info);//节假日计价配置规则
        pricingDetailMapper.insert(insert);
        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.divide(new BigDecimal(100)).doubleValue()
                    +"元，超过后"+unitPrice.divide(new BigDecimal(100)).doubleValue()+"元/"
                    +unitTime+"分钟";
        }
        return  title;
@@ -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);
        }
@@ -230,6 +234,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);