Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

zqy

2024-05-26 b1643b619696f2578e22d7f3bcc2cacca63a1ce6

 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java

@@ -21,6 +21,7 @@
import com.ruoyi.service.ZTravelBaseService;
import com.ruoyi.service.ZTravelPriceDetailService;
import com.ruoyi.service.ZTravelPriceService;
import org.apache.xmlbeans.impl.xb.xmlschema.LangAttribute;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -67,8 +68,14 @@
        LambdaQueryWrapper<ZTravelPrice> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZTravelPrice::getMyId, userId)
                .eq(zTravelPrice.getTotalDay() != null, ZTravelPrice::getTotalDay, zTravelPrice.getTotalDay())
                .like(StringUtils.isNotEmpty(zTravelPrice.getTitle()),ZTravelPrice::getTitle,zTravelPrice.getTitle())
                .eq(zTravelPrice.getTotalCost()!=null,ZTravelPrice::getTotalCost,zTravelPrice.getTotalCost())
                .le(zTravelPrice.getEnd() != null, ZTravelPrice::getEndTime, zTravelPrice.getEnd())
                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart());
                .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart())
                .eq(zTravelPrice.getEat()!=null,ZTravelPrice::getEat,zTravelPrice.getEat())
                .eq(zTravelPrice.getStay()!=null,ZTravelPrice::getStay,zTravelPrice.getStay())
                .eq(zTravelPrice.getTraffic()!=null,ZTravelPrice::getTraffic,zTravelPrice.getTraffic())
                .eq(zTravelPrice.getShopping()!=null,ZTravelPrice::getShopping,zTravelPrice.getShopping());

        lqw.orderBy(true, true, ZTravelPrice::getStartTime);
        return lqw;
@@ -206,6 +213,10 @@
        zTravelPrice.setEndTime(priceDto.getEndTime());
        zTravelPrice.setTotalDay(totalDay);
        zTravelPrice.setTitle(priceDto.getTitle());
        zTravelPrice.setTableName(priceDto.getTableName());
        zTravelPrice.setProperty(priceDto.getProperty());
        zTravelPrice.setType(priceDto.getType());
        zTravelPrice.setDestination(priceDto.getDestination());
        zTravelPrice.setEat(eatTotal);
        zTravelPrice.setStay(stayTotal);
        zTravelPrice.setTraffic(trafficTotal);
@@ -222,12 +233,33 @@
    }

    @Override
    @Transactional
    public AjaxResult myUpdate(PriceDto priceDto) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        List<ZTravelPriceDetail> detailList = priceDto.getDetailList();

        //先查数据库里面这一次费用所有的数据
        LambdaQueryWrapper<ZTravelPriceDetail> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZTravelPriceDetail::getFeeId,priceDto.getId());
        List<ZTravelPriceDetail> selectDetailList = zTravelPriceDetailService.list(lqw);

        //把传过来的数据中没有的id，在数据库中删掉
        List<Long> detailIdList = detailList.stream().filter(priceDetail -> priceDetail.getId() != null).map(ZTravelPriceDetail::getId).collect(Collectors.toList());
        List<Long> deleteIdList = selectDetailList.stream().filter(priceDetail -> !detailIdList.contains(priceDetail.getId())).map(ZTravelPriceDetail::getId).collect(Collectors.toList());
        zTravelPriceDetailService.removeBatchByIds(deleteIdList);


        //如果传过来的列表的数据里面没有id
        List<ZTravelPriceDetail> addPriceDetail = detailList.stream().filter(priceDetail -> priceDetail.getId() == null || priceDetail.getId() == 0 ).collect(Collectors.toList());
        addPriceDetail.forEach(priceDetail -> {
            priceDetail.setFeeId(priceDto.getId());
        });

        //那就先增加到数据库中
        zTravelPriceDetailService.saveBatch(addPriceDetail);

        //得到总天数
        long count = detailList.stream().map(ZTravelPriceDetail::getHappenTime).distinct().count();
@@ -297,6 +329,10 @@
        zTravelPrice.setEndTime(priceDto.getEndTime());
        zTravelPrice.setTotalDay(totalDay);
        zTravelPrice.setTitle(priceDto.getTitle());
        zTravelPrice.setTableName(priceDto.getTableName());
        zTravelPrice.setProperty(priceDto.getProperty());
        zTravelPrice.setType(priceDto.getType());
        zTravelPrice.setDestination(priceDto.getDestination());
        zTravelPrice.setEat(eatTotal);
        zTravelPrice.setStay(stayTotal);
        zTravelPrice.setTraffic(trafficTotal);