解决冲突

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

@@ -146,8 +146,6 @@ public interface PerformanceFeign {
     @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
     Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
 
-    @PostMapping(value = {"clx-performance/feign/orderGoods/saveBindTruck"})
-    Result<Object> saveBindTruck(@RequestBody @Validated DistributionTruckParam param);
 
     /**
      * 取消货单
@@ -157,15 +155,4 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/orderGoods/cancelOrderGoods"})
     Result<BigDecimal> cancelOrderGoods(@RequestBody @Validated CancelOrderGoodsParam param);
 
-    /**
-     * 更新挂单运费
-     */
-    @PostMapping(value = {"clx-performance/feign/orderGoods/updatePendingOrderFright"})
-    Result<Void> updatePendingOrderFright(@RequestParam("orderGoodsNo") String orderGoodsNo,@RequestParam("pendingOrderFreight") BigDecimal pendingOrderFreight);
-
-    /**
-     * 获取平台服务费配置
-     */
-    @GetMapping(value = {"clx-performance/feign/platformServiceFee/getPlatformServiceFeeConfig"})
-    Result<PlatformServiceFeeConfigFeignVO> getPlatformServiceFeeConfig();
 }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -107,6 +107,5 @@ public interface OrderGoodsService {
     void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
 
 
-    void updateFrightPrice(String orderGoodsNo,BigDecimal pendingOrderFreight);
     BigDecimal cancelOrderGoods(CancelOrderGoodsParam param);
 }