|
|
@@ -1,24 +1,28 @@
|
|
|
package com.tourism.webadmin.back.controller;
|
|
|
|
|
|
+import ch.qos.logback.core.joran.sanity.Pair;
|
|
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import com.tourism.common.core.constant.ErrorCodeEnum;
|
|
|
import com.tourism.common.core.object.MyOrderParam;
|
|
|
import com.tourism.common.core.object.MyRelationParam;
|
|
|
import com.tourism.common.core.object.ResponseResult;
|
|
|
+import com.tourism.common.core.util.MyDateUtil;
|
|
|
import com.tourism.common.core.util.MyModelUtil;
|
|
|
+import com.tourism.webadmin.app.website.dto.DatePriceSaveDto;
|
|
|
import com.tourism.webadmin.app.website.vo.DateRangePriceVo;
|
|
|
import com.tourism.webadmin.app.website.vo.DateRangesPriceVo;
|
|
|
import com.tourism.webadmin.back.model.TourismDatePrice;
|
|
|
import com.tourism.webadmin.back.model.TourismProject;
|
|
|
import com.tourism.webadmin.back.service.TourismDatePriceService;
|
|
|
+import com.tourism.webadmin.back.service.TourismProjectService;
|
|
|
import com.tourism.webadmin.back.vo.TourismProjectVo;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.collections4.CollectionUtils;
|
|
|
+import org.apache.commons.lang3.time.DateUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestParam;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDate;
|
|
|
@@ -43,8 +47,10 @@ public class ExtraController {
|
|
|
|
|
|
@Autowired
|
|
|
private TourismDatePriceService tourismDatePriceService;
|
|
|
+ @Autowired
|
|
|
+ private TourismProjectService tourismProjectService;
|
|
|
/**
|
|
|
- * 查看指定旅游项目管理对象详情。
|
|
|
+ * 查看指定旅游项目的日历价格。
|
|
|
*
|
|
|
* @param projectId 项目id。
|
|
|
* @return 应答结果对象，包含对象详情。
|
|
|
@@ -66,53 +72,159 @@ public class ExtraController {
|
|
|
List<TourismDatePrice> tourismDatePriceList =
|
|
|
tourismDatePriceService.getTourismDatePriceList(tourismDatePrice, orderBy);
|
|
|
|
|
|
- // 使用 reduce 方法处理
|
|
|
List<DateRangePriceVo> result = new ArrayList<>();
|
|
|
Date startDate = null;
|
|
|
Date endDate = null;
|
|
|
BigDecimal currentAdultPrice = null;
|
|
|
BigDecimal currentChildrenPrice = null;
|
|
|
+ Date lastDate = null;
|
|
|
for (int i = 0; i < tourismDatePriceList.size(); i++) {
|
|
|
TourismDatePrice current = tourismDatePriceList.get(i);
|
|
|
Date currentDate = current.getDepartureDate();
|
|
|
BigDecimal currentPrice = current.getAdultPrice();
|
|
|
BigDecimal currentChildPrice = current.getChildrenPrice();
|
|
|
|
|
|
- if (i == 0 || (currentDate.equals(startDate) || currentDate.equals(new Date(startDate.getTime() + 24 * 60 * 60 * 1000))) && currentPrice.equals(currentAdultPrice) && currentChildPrice.equals(currentChildrenPrice)) {
|
|
|
+ if (i == 0 || (currentDate.equals(new Date(lastDate.getTime() + 24 * 60 * 60 * 1000)) && currentPrice.equals(currentAdultPrice) && currentChildPrice.equals(currentChildrenPrice))) {
|
|
|
if (startDate == null) {
|
|
|
startDate = currentDate;
|
|
|
}
|
|
|
endDate = currentDate;
|
|
|
currentAdultPrice = currentPrice;
|
|
|
currentChildrenPrice = currentChildPrice;
|
|
|
+ lastDate = currentDate;
|
|
|
} else {
|
|
|
if (startDate != null) {
|
|
|
- result.add(new DateRangePriceVo(startDate, endDate, currentAdultPrice, currentChildrenPrice));
|
|
|
-// result.add(new DateRangePriceVo(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), currentAdultPrice, currentChildrenPrice));
|
|
|
+ result.add(new DateRangePriceVo(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), currentAdultPrice, currentChildrenPrice));
|
|
|
}
|
|
|
startDate = currentDate;
|
|
|
endDate = currentDate;
|
|
|
currentAdultPrice = currentPrice;
|
|
|
currentChildrenPrice = currentChildPrice;
|
|
|
+ lastDate = currentDate;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 添加最后一个范围
|
|
|
if (startDate != null) {
|
|
|
- result.add(new DateRangePriceVo(startDate, endDate, currentAdultPrice, currentChildrenPrice));
|
|
|
+ result.add(new DateRangePriceVo(startDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), endDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), currentAdultPrice, currentChildrenPrice));
|
|
|
}
|
|
|
+
|
|
|
List<DateRangesPriceVo> dateRangesPriceVoList = new ArrayList<>();
|
|
|
|
|
|
result.stream().forEach(u->{
|
|
|
DateRangesPriceVo dateRangesPriceVo = new DateRangesPriceVo();
|
|
|
dateRangesPriceVo.setAdultPrice(u.getAdultPrice());
|
|
|
dateRangesPriceVo.setChildrenPrice(u.getChildrenPrice());
|
|
|
- List<Date> list = new ArrayList<>();
|
|
|
+ List<LocalDate> list = new ArrayList<>();
|
|
|
list.add(u.getStartDate());list.add(u.getEndDate());
|
|
|
- dateRangesPriceVo.setDepartureDate(list);
|
|
|
+ dateRangesPriceVo.setDateRange(list);
|
|
|
dateRangesPriceVoList.add(dateRangesPriceVo);
|
|
|
});
|
|
|
return ResponseResult.success(dateRangesPriceVoList);
|
|
|
|
|
|
}
|
|
|
+ /**
|
|
|
+ * 保存指定旅游项目的日历价格。
|
|
|
+ *
|
|
|
+ * @param datePriceSaveDto 日历价格数组。
|
|
|
+ * @return 应答结果对象，包含对象详情。
|
|
|
+ */
|
|
|
+ @Transactional
|
|
|
+ @SaCheckPermission("tourismProject.view")
|
|
|
+ @PostMapping("/saveDatePrice")
|
|
|
+ public ResponseResult<Void> saveDatePrice(@RequestBody DatePriceSaveDto datePriceSaveDto) {
|
|
|
+ //dateRangesPriceVoList为空的话，直接返回成功
|
|
|
+ if(CollectionUtils.isEmpty(datePriceSaveDto.getDateRangesPriceVoList())){
|
|
|
+ return ResponseResult.success();
|
|
|
+ }
|
|
|
+ //取旅游项目的价格，来对列表数据进行对比，如果列表数据低于旅游项目的价格，则进行提示
|
|
|
+ TourismProject tourismProject = tourismProjectService.getById(datePriceSaveDto.getProjectId());
|
|
|
+ if(tourismProject == null){
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.DATA_SAVE_FAILED,"旅游项目不存在");
|
|
|
+ }else {
|
|
|
+ ArrayList<BigDecimal> adultPriceList =
|
|
|
+ datePriceSaveDto.getDateRangesPriceVoList().stream().map(DateRangesPriceVo::getAdultPrice).collect(Collectors.toCollection(ArrayList::new));
|
|
|
+ ArrayList<BigDecimal> childrenPriceList =
|
|
|
+ datePriceSaveDto.getDateRangesPriceVoList().stream().map(DateRangesPriceVo::getChildrenPrice).collect(Collectors.toCollection(ArrayList::new));
|
|
|
+
|
|
|
+ for(BigDecimal adultPrice : adultPriceList){
|
|
|
+ if(tourismProject.getPrice().compareTo(adultPrice) > 0){
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.PRICE_ERROR,"成人价格不能低于旅游项目的价格");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for(BigDecimal childrenPrice : childrenPriceList){
|
|
|
+ if(tourismProject.getPrice().compareTo(childrenPrice) > 0){
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.PRICE_ERROR,"儿童价格不能低于旅游项目的价格");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ //进行时间范围的判断，判断时间段是否交错;交错的话，则返回时间交错的信息
|
|
|
+ List<DateRangePriceVo> result = new ArrayList<>();
|
|
|
+ for (DateRangesPriceVo dateRangesPriceVo : datePriceSaveDto.getDateRangesPriceVoList()) {
|
|
|
+ DateRangePriceVo dateRangePriceVo = new DateRangePriceVo(
|
|
|
+ dateRangesPriceVo.getDateRange().get(0),dateRangesPriceVo.getDateRange().get(1),
|
|
|
+ dateRangesPriceVo.getAdultPrice(),dateRangesPriceVo.getChildrenPrice());
|
|
|
+ result.add(dateRangePriceVo);
|
|
|
+ }
|
|
|
+ //转换出来时间后，判断时间是否交错
|
|
|
+ for(int i=0;i<result.size();i++) {
|
|
|
+ if (result.get(i).getStartDate().isEqual(result.get(i).getEndDate()) || result.get(i).getStartDate().isBefore(result.get(i).getEndDate())){
|
|
|
+ for (int j = 0; j < result.size(); j++) {
|
|
|
+ if (i == j) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ //如果两条数据的开始日期或者结束日期一致的话，则进行报错返回
|
|
|
+ if (result.get(i).getStartDate().isEqual(result.get(j).getStartDate()) || (result.get(i).getStartDate().isEqual(result.get(j).getEndDate()))) {
|
|
|
+// return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "开始日期为:" + result.get(i).getStartDate() + "和" + result.get(j).getStartDate() + "的时间段有重叠");
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "第"+ (i+1) +"条数据和第" + (j+1) + "条数据的时间段有重叠");
|
|
|
+ }
|
|
|
+ if (result.get(i).getStartDate().isAfter(result.get(j).getStartDate()) && result.get(i).getStartDate().isBefore(result.get(j).getEndDate())) {
|
|
|
+// return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "开始日期为:" + result.get(i).getStartDate() + "和" + result.get(j).getStartDate() + "的时间段有重叠");
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "第"+ (i+1) +"条数据和第" + (j+1) + "条数据的时间段有重叠");
|
|
|
+ }
|
|
|
+ if (result.get(i).getEndDate().isAfter(result.get(j).getStartDate()) && result.get(i).getEndDate().isBefore(result.get(j).getEndDate())) {
|
|
|
+// return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "开始日期为:" + result.get(i).getStartDate() + "和" + result.get(j).getStartDate() + "的时间段有重叠");
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "第"+ (i+1) +"条数据和第" + (j+1) + "条数据的时间段有重叠");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ return ResponseResult.error(ErrorCodeEnum.DATE_OVERLAP, "开始日期为:" + result.get(i).getStartDate() + ",结束日期为:" + result.get(i).getEndDate() + "的时间段有误,请重新输入");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //时间没有问题的话，则进行项目日历的查询，先进行删除
|
|
|
+ TourismDatePrice filter = new TourismDatePrice();
|
|
|
+ filter.setProjectId(datePriceSaveDto.getProjectId());
|
|
|
+ filter.setNowDate(MyDateUtil.truncateToDay(new Date()));
|
|
|
+ List<TourismDatePrice> tourismDatePriceList = tourismDatePriceService.getTourismDatePriceList(filter, "");
|
|
|
+ if(!CollectionUtils.isEmpty(tourismDatePriceList)){
|
|
|
+ tourismDatePriceService.removeByIds(tourismDatePriceList.stream().map(TourismDatePrice::getId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ //根据result构建新增的数据，再进行新增
|
|
|
+ result.stream().forEach(item-> {
|
|
|
+ if (item.getStartDate().equals(item.getEndDate())) {
|
|
|
+ TourismDatePrice tourismDatePrice = new TourismDatePrice();
|
|
|
+ tourismDatePrice.setProjectId(datePriceSaveDto.getProjectId());
|
|
|
+ tourismDatePrice.setDepartureDate(Date.from(item.getStartDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
|
|
|
+ tourismDatePrice.setAdultPrice(item.getAdultPrice());
|
|
|
+ tourismDatePrice.setChildrenPrice(item.getChildrenPrice());
|
|
|
+ tourismDatePriceService.saveNew(tourismDatePrice);
|
|
|
+ } else {
|
|
|
+ //对item的开始日期进行新增，直到新增到item的endDate，把中间的日期进行汇总，形成一个新的list
|
|
|
+ List<TourismDatePrice> tourismDatePriceList1 = new ArrayList<>();
|
|
|
+ for (LocalDate date = item.getStartDate(); date.isBefore(item.getEndDate().plusDays(1)); date = date.plusDays(1)) {
|
|
|
+ TourismDatePrice tourismDatePrice = new TourismDatePrice();
|
|
|
+ tourismDatePrice.setProjectId(datePriceSaveDto.getProjectId());
|
|
|
+ tourismDatePrice.setDepartureDate(Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant()));
|
|
|
+ tourismDatePrice.setAdultPrice(item.getAdultPrice());
|
|
|
+ tourismDatePrice.setChildrenPrice(item.getChildrenPrice());
|
|
|
+ tourismDatePriceList1.add(tourismDatePrice);
|
|
|
+ }
|
|
|
+ //批量新增
|
|
|
+ tourismDatePriceService.saveNewBatch(tourismDatePriceList1);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return ResponseResult.success();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
chenchen