From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
index 6ed0f80..2cda4f0 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
@@ -1,7 +1,6 @@
 package com.ruoyi.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,10 +9,8 @@
 import com.ruoyi.common.utils.MapUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.domain.ZTravelBase;
-import com.ruoyi.domain.ZTravelPrice;
 import com.ruoyi.domain.ZTravelPrice;
 import com.ruoyi.domain.ZTravelPriceDetail;
 import com.ruoyi.domain.dto.PriceDto;
@@ -21,11 +18,9 @@
 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;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -68,8 +63,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;
@@ -207,6 +208,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);
@@ -319,6 +324,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);

--
Gitblit v1.9.1