定向车辆

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.constraints.NotBlank;
 import java.util.List;
+import java.util.Set;
 
 @FeignClient(name = "clx-performance")
 public interface PerformanceFeign {
@@ -18,6 +19,7 @@ public interface PerformanceFeign {
      * @param orderGoodsNo
      * @return
      */
+    @Deprecated
     @GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getTrucksByOrderGoodsNo"})
     Result<List<Integer>> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo);
 
@@ -27,4 +29,23 @@ public interface PerformanceFeign {
     @GetMapping(value = {"clx-performance/feign/orderGoods/getOrderGoodsListByOrderNo"})
     List<OrderGoodsFeignVO> getOrderGoodsListByOrderNo(@RequestParam String orderNo);
 
+    /**
+     * 公开货源调用
+     *
+     * @return
+     */
+    @GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getPublicTruckList"})
+    Result<Set<String>> getPublicTruckList();
+
+    /**
+     * 定向货源调用
+     *
+     * @param orderGoodsNo、
+     * @param userNo
+     * @return
+     */
+    @GetMapping(value = {"clx-performance/feign/orderGoodsDriverTruck/getPrivateTruckList"})
+    Result<List<String>> getPrivateTruckList(@RequestParam("orderGoodsNo") @NotBlank(message = "货单编号不可为空") String orderGoodsNo,
+                                             @RequestParam("userNo") @NotBlank(message = "用户编号不可为空") Long userNo);
+
 }

performance-web/src/main/java/com/clx/performance/controller/feign/TruckFeignController.java

 package com.clx.performance.controller.feign;
 
+import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.service.OrderGoodsTruckBindService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
@@ -10,8 +11,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
+import java.util.Set;
 
 @RestController
 @RequestMapping("/feign/orderGoodsDriverTruck")
@@ -22,9 +25,23 @@ public class TruckFeignController {
 
     private final OrderGoodsTruckBindService orderGoodsTruckService;
 
+    private final GoodsOrderTruckRecordComponent goodsOrderTruckRecordComponent;
+
+    @Deprecated
     @GetMapping({"/getTrucksByOrderGoodsNo"})
     Result<List<Integer>> getTrucksByOrderGoodsNo(@RequestParam("orderGoodsNo") @NotNull(message = "货单编号不可为空") String orderGoodsNo){
         return Result.ok(orderGoodsTruckService.getTrucksByOrderGoodsNo(orderGoodsNo));
     }
 
+    @GetMapping({"/getPublicTruckList"})
+    Result<Set<String>> getPublicTruckList(){
+        return Result.ok(goodsOrderTruckRecordComponent.getPublicTruckList());
+    }
+
+    @GetMapping({"/getPrivateTruckList"})
+    Result<List<String>> getPrivateTruckList(@RequestParam("orderGoodsNo") @NotNull(message = "货单编号不可为空") String orderGoodsNo,
+                                             @RequestParam("userNo") @NotBlank(message = "用户编号不可为空") Long userNo){
+        return Result.ok(goodsOrderTruckRecordComponent.getPrivateTruckList(orderGoodsNo,userNo));
+    }
+
 }