获取可以发货的订单列表区分品牌和三方墙盒

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

@@ -196,19 +196,20 @@ public class FlowOrderController {
     @GetMapping("/getCanDeliveryOrder")
     @ApiOperation("获取可以发货的订单列表")
     public ResponseMessage2 getCanDeliveryOrder(@RequestParam String orderId,@RequestParam String  isproduct){
-        List<OrderVo> list=flowOrderMapper.getCanDeliveryOrder(orderId);
+        List<OrderVo> list=flowOrderMapper.getCanDeliveryOrder(orderId,"品牌墙盒".equals(isproduct));
         list.stream().forEach(i->{
             MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(i.getItemModel());
            if (materials!=null){
                i.setMaterialName(materials.getMaterialsName());
            }
         });
-        if ("品牌墙盒".equals(isproduct)){
-            List<OrderVo> 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(list);
-        }
+        return ResponseMessage2.Success2(list);
+//        if ("品牌墙盒".equals(isproduct)){
+//            List<OrderVo> 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(list);
+//        }
     }
 }

src/main/java/com/boco/nbd/wios/flow/mapper/def/FlowOrderMapper.java

@@ -97,7 +97,7 @@ public interface FlowOrderMapper extends BaseMapper3<OrderPO> {
      */
     List<VisitOrderPO> getVisitOrderScore(OrderBo orderBo);
 
-    @Select("select o.* from t_order o inner join t_wallbox_apply w on o.id=w.order_id where o.id like concat('%', #{orderId}, '%') and w.check_status=2 and IFNULL(w.tracking_status,'0')='0'")
-    List<OrderVo> getCanDeliveryOrder(@Param("orderId")String orderId);
+    //@Select("select o.* from t_order o inner join t_wallbox_apply w on o.id=w.order_id where o.id like concat('%', #{orderId}, '%') and w.check_status=2 and IFNULL(w.tracking_status,'0')='0'")
+    List<OrderVo> getCanDeliveryOrder(@Param("orderId")String orderId,@Param("isproduct")boolean isproduct);
 
 }

src/main/resources/mybatis/mapper/def/common/FlowOrderMapper.xml

@@ -296,4 +296,20 @@
             and a.install_finish_time <= #{installFinishEndTime}
         </if>
     </select>
+
+    <select id="getCanDeliveryOrder" resultType="com.boco.nbd.wios.manage.entity.bo.OrderVo">
+        select o.*
+        from t_order o
+            inner join t_wallbox_apply w on o.id=w.order_id
+            left join t_oem_cascade tc on tc.id = o.wallbox_model
+        where o.id like concat('%', #{orderId}, '%')
+          and w.check_status=2
+          and IFNULL(w.tracking_status,'0')='0'
+            <if test="isproduct == true">
+               and tc.name='CAMS'
+            </if>
+            <if test="isproduct == false">
+                and tc.name != 'CAMS'
+            </if>
+    </select>
 </mapper>
\ No newline at end of file