815646

whywhyo

2023-08-27 a2e4f4e2aad027c72799588ec2a4deac73779e17

815646

 zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java

@@ -29,6 +29,12 @@

    private String title;

    private String property;

    private String tableName;

    private String type;

    private List<ZTravelPriceDetail> detailList;

}

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

@@ -444,6 +444,20 @@
                }
            }

            if(genealogy.getPhoneNumber()!=null){
                if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getUnit()!=null){
                if(data.getUnit()!=genealogy.getUnit()){
                    it.remove();
                    continue;
                }
            }

            if(genealogy.getBirth()!=null){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();

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

@@ -325,6 +325,9 @@
        zTravelPrice.setEndTime(priceDto.getEndTime());
        zTravelPrice.setTotalDay(totalDay);
        zTravelPrice.setTitle(priceDto.getTitle());
        zTravelPrice.setTableName(priceDto.getTableName());
        zTravelPrice.setProperty(priceDto.getProperty());
        zTravelPrice.setType(priceDto.getType());
        zTravelPrice.setEat(eatTotal);
        zTravelPrice.setStay(stayTotal);
        zTravelPrice.setTraffic(trafficTotal);