新增一个查询参数 isproduct 有两个值 品牌墙盒/三方墙盒 品牌墙盒就在先用的筛选基础上筛选出订单绑定的墙盒品牌为'CAMS'的订单号 三方墙盒就筛选除了CAMS品牌以外的所有订单号

src/main/java/com/boco/nbd/wios/flow/controller/FlowOrderController.java

@@ -30,7 +30,9 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description 订单管理处理类
@@ -187,7 +189,14 @@ public class FlowOrderController {
 
     @GetMapping("/getCanDeliveryOrder")
     @ApiOperation("获取可以发货的订单列表")
-    public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId){
-        return ResponseMessage2.Success2(flowOrderMapper.getCanDeliveryOrder(orderId));
+    public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
+        List<OrderPO> list=flowOrderMapper.getCanDeliveryOrder(orderId);
+        if ("品牌墙盒".equals(isproduct)){
+            List<OrderPO> has = list.stream().filter(i -> i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
+            return ResponseMessage2.Success2(has);
+        }else {
+            List<OrderPO> has = list.stream().filter(i -> !i.getInstallWallboxModel().equals("CAMS")).collect(Collectors.toList());
+            return ResponseMessage2.Success2(has);
+        }
     }
 }