[fix]

用户设置默认头像

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourProjectGroupPurchaseDetailController.java

@@ -1,6 +1,7 @@
 package com.tourism.webadmin.back.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.google.common.collect.Lists;
 import com.tourism.common.log.annotation.OperationLog;
 import com.tourism.common.log.model.constant.SysOperationLogType;
 import com.github.pagehelper.page.PageMethod;
@@ -69,6 +70,13 @@ public class TourProjectGroupPurchaseDetailController {
         if(tourProjectGroupPurchaseServiceOne.getMaxCount() < tourProjectGroupPurchaseDetailDto.getMinCount()){
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "阶梯价格的最低人数不能超过拼团最高人数,请重新填写");
         }
+        //判断最高人数时，是否为最低价格
+        if(tourProjectGroupPurchaseDetailDto.getMaxCount().equals(tourProjectGroupPurchaseServiceOne.getMaxCount())){
+            if(!tourProjectGroupPurchaseDetailDto.getAdultPrice().equals(tourProjectGroupPurchaseServiceOne.getAdultPrice()) ||
+                    !tourProjectGroupPurchaseDetailDto.getChildrenPrice().equals(tourProjectGroupPurchaseServiceOne.getChildrenPrice())){
+                return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "最高人数时，价格必须与拼团价格一致,请重新填写");
+            }
+        }
         //判断人数是否存在交集
         TourProjectGroupPurchaseDetail tourProjectGroupPurchaseDetailVerify = new TourProjectGroupPurchaseDetail();
         tourProjectGroupPurchaseDetailVerify.setGroupPurchaseCode(tourProjectGroupPurchaseDetailDto.getGroupPurchaseCode());
@@ -125,16 +133,25 @@ public class TourProjectGroupPurchaseDetailController {
                 tourProjectGroupPurchaseDetailService.getTourProjectGroupPurchaseDetailList(tourProjectGroupPurchaseDetailVerify, "");
         if(CollectionUtils.isNotEmpty(tourProjectGroupPurchaseDetailList)){
             for(TourProjectGroupPurchaseDetail item:tourProjectGroupPurchaseDetailList){
-                if(item.getMaxCount() >= tourProjectGroupPurchaseDetailDto.getMinCount() && tourProjectGroupPurchaseDetailDto.getMaxCount() >= item.getMinCount()){
-                    return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "人数存在交集,请修正后再提交。");
+                if(!item.getId().equals(tourProjectGroupPurchaseDetailDto.getId())) {
+                    if (item.getMaxCount() >= tourProjectGroupPurchaseDetailDto.getMinCount() && tourProjectGroupPurchaseDetailDto.getMaxCount() >= item.getMinCount()) {
+                        return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "人数存在交集,请修正后再提交。");
+                    }
                 }
             }
         }
+        //判断最高人数时，是否为最低价格
+        if(tourProjectGroupPurchaseDetailDto.getMaxCount().equals(tourProjectGroupPurchaseServiceOne.getMaxCount())){
+            if(tourProjectGroupPurchaseDetailDto.getAdultPrice().compareTo(tourProjectGroupPurchaseServiceOne.getAdultPrice()) != 0 ||
+                    tourProjectGroupPurchaseDetailDto.getChildrenPrice().compareTo(tourProjectGroupPurchaseServiceOne.getChildrenPrice()) !=0){
+                return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "最高人数时，价格必须与拼团价格一致,请重新填写");
+            }
+        }
         TourProjectGroupPurchaseDetail tourProjectGroupPurchaseDetail = MyModelUtil.copyTo(tourProjectGroupPurchaseDetailDto, TourProjectGroupPurchaseDetail.class);
         TourProjectGroupPurchaseDetail originalTourProjectGroupPurchaseDetail = tourProjectGroupPurchaseDetailService.getById(tourProjectGroupPurchaseDetail.getId());
         if (originalTourProjectGroupPurchaseDetail == null) {
             // NOTE: 修改下面方括号中的话述
-            errorMessage = "数据验证失败，当前 [数据] 并不存在，请刷新后重试！";
+            errorMessage = "数据验证失败，当前 [数据] u不存在，请刷新后重试！";
             return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST, errorMessage);
         }
         if (!tourProjectGroupPurchaseDetailService.update(tourProjectGroupPurchaseDetail, originalTourProjectGroupPurchaseDetail)) {