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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

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

@@ -56,13 +56,13 @@
        insert.setPricePramId(pricingDetail.getPricePramId());
        insert.setBikeTypeId(pricingDetail.getBikeTypeId());
        insert.setBaseTime(pricingDetail.getBaseTime());
        insert.setBasePrice(pricingDetail.getBasePrice());
        insert.setUnitTime(pricingDetail.getUnitTime());
        insert.setUnitPrice(pricingDetail.getUnitPrice());
        insert.setHolidayBaseTime(pricingDetail.getHolidayBaseTime());
        insert.setHolidayBasePrice(pricingDetail.getHolidayBasePrice());
        insert.setHolidayUnitTime(pricingDetail.getHolidayUnitTime());
        insert.setHolidayUnitPrice(pricingDetail.getHolidayUnitPrice());
        insert.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
        insert.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
        insert.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
        insert.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));
        insert.setInfo(pricingDetail.getInfo());
        insert.setTitle(pricingDetail.getTitle());
        pricingDetailMapper.insert(pricingDetail);
@@ -134,6 +134,11 @@
        LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        pricingDetail.setEditDate(new Date());
        pricingDetail.setEditor(principal.getId());
        pricingDetail.setBasePrice(Constants.formatDecimalNum(pricingDetail.getBasePrice()).multiply(new BigDecimal(100)));
        pricingDetail.setUnitPrice(Constants.formatDecimalNum(pricingDetail.getUnitPrice()).multiply(new BigDecimal(100)));
        pricingDetail.setHolidayBasePrice(Constants.formatDecimalNum(pricingDetail.getHolidayBasePrice()).multiply(new BigDecimal(100)));
        pricingDetail.setHolidayUnitPrice(Constants.formatDecimalNum(pricingDetail.getHolidayUnitPrice()).multiply(new BigDecimal(100)));

        pricingDetailMapper.updateById(pricingDetail);
    }

@@ -149,13 +154,27 @@

    @Override
    public PricingDetail findById(String id) {
        return pricingDetailMapper.selectById(id);
        PricingDetail model =  pricingDetailMapper.selectById(id);
        if(model !=null ){
            model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
            model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
            model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
            model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
        }
        return model;
    }

    @Override
    public PricingDetail findOne(PricingDetail pricingDetail) {
        QueryWrapper<PricingDetail> wrapper = new QueryWrapper<>(pricingDetail);
        return pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
        PricingDetail model =  pricingDetailMapper.selectOne(wrapper.last(" limit 1"));
        if(model !=null ){
            model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
            model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
            model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
            model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
        }
        return model;
    }

    @Override
@@ -166,7 +185,16 @@
                .eq(BaseParam::getType,Constants.THREE);
        wrapper.selectAll(PricingDetail.class)
                .selectAs(BaseParam::getName,PricingDetail::getBikeTypeName);
        return pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
        List<PricingDetail> result = pricingDetailJoinMapper.selectJoinList(PricingDetail.class,wrapper);
        if(result!=null){
            for(PricingDetail model :result){
                model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
                model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
                model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
                model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
            }
        }
        return result;
    }

    @Override
@@ -237,7 +265,16 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(pricingDetailMapper.selectPage(page, queryWrapper));
        IPage<PricingDetail> result =pricingDetailMapper.selectPage(page, queryWrapper);
        if(result.getRecords()!= null ){
            for(PricingDetail model : result.getRecords()){
                model.setBasePrice(Constants.translateMoney(model.getBasePrice()));
                model.setHolidayBasePrice(Constants.translateMoney(model.getHolidayBasePrice()));
                model.setUnitPrice(Constants.translateMoney(model.getUnitPrice()));
                model.setHolidayUnitPrice(Constants.translateMoney(model.getHolidayUnitPrice()));
            }
        }
        return PageData.from(result);
    }

    @Override