[fix]

修改价格判断

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

@@ -67,13 +67,16 @@ public class TourProjectGroupPurchaseDetailController {
         TourProjectGroupPurchase tourProjectGroupPurchase = new TourProjectGroupPurchase();
         tourProjectGroupPurchase.setCode(tourProjectGroupPurchaseDetailDto.getGroupPurchaseCode());
         TourProjectGroupPurchase tourProjectGroupPurchaseServiceOne = tourProjectGroupPurchaseService.getOne(tourProjectGroupPurchase);
+        if(tourProjectGroupPurchaseServiceOne == null){
+            return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "团购设置不存在,请刷新页面后重试");
+        }
         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())){
+            if(tourProjectGroupPurchaseDetailDto.getAdultPrice().compareTo(tourProjectGroupPurchaseServiceOne.getAdultPrice()) != 0 ||
+                    tourProjectGroupPurchaseDetailDto.getChildrenPrice().compareTo(tourProjectGroupPurchaseServiceOne.getChildrenPrice()) != 0){
                 return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, "最高人数时，价格必须与拼团价格一致,请重新填写");
             }
         }