修改接口

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourController.java

@@ -84,10 +84,11 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
         @ApiModelProperty(value = "具体商品（商品项）id")
         private String spePriceId;
 
-        //自己乘客ids
-        @ApiModelProperty(value = "自己乘客ids")
-        private String tourUserIds;
+        @ApiModelProperty(value = "成人个数")
+        Integer number;
 
+        @ApiModelProperty(value = "儿童个数")
+        Integer childNumber;
 
     }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -131,22 +131,27 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         BigDecimal tourAmount = BigDecimal.ZERO;
         BigDecimal realAmount = BigDecimal.ZERO;
 
-        List<TourUser> users = new ArrayList<TourUser>();
         if(StrUtil.isNotBlank(detail.getTourUserIds())) {
-            users = tourFeign.getTourUsers(detail.getTourUserIds()).getData();
+            List<TourUser> users = new ArrayList<TourUser>();
+            if(StrUtil.isNotBlank(detail.getTourUserIds())) {
+                users = tourFeign.getTourUsers(detail.getTourUserIds()).getData();
+            }
+
+            List<TourUser> notChilds = users.parallelStream().filter(tourUser ->{
+                return !IS_CHILD.equals(tourUser.getIsChild());
+            }).collect(Collectors.toList());
+
+            List<TourUser> childs = users.parallelStream().filter(tourUser ->{
+                return IS_CHILD.equals(tourUser.getIsChild());
+            }).collect(Collectors.toList());
+
+            detail.setNumber(childs.size());
+            detail.setChildNumber(notChilds.size());
+            detail.setTotalNumber(users.size());
+        }else{
+            detail.setTotalNumber(detail.getNumber() + detail.getChildNumber());
         }
 
-        List<TourUser> notChilds = users.parallelStream().filter(tourUser ->{
-            return !IS_CHILD.equals(tourUser.getIsChild());
-        }).collect(Collectors.toList());
-
-        List<TourUser> childs = users.parallelStream().filter(tourUser ->{
-            return IS_CHILD.equals(tourUser.getIsChild());
-        }).collect(Collectors.toList());
-
-        detail.setNumber(childs.size());
-        detail.setChildNumber(notChilds.size());
-        detail.setTotalNumber(users.size());
 
         //计算旅游价格
         ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{