Merge branch 'v1.0_init_contract_20240306' into dev

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

 package com.clx.performance.feign;
 
+import com.clx.open.sdk.request.action.BreakContractSettlementGenerateAction;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "clx-performance",configuration = PerformanceClientConfiguration.class)
@@ -14,4 +17,8 @@ public interface SettlementFeign {
     @GetMapping("clx-performance/feign/settlement/thawAndLockSettlement")
     Result<Boolean> thawAndLockSettlement(@RequestParam String orderNo);
 
+    @ApiOperation(value = "生成违约结算单")
+    @PostMapping("clx-performance/feign/breakContract/saveBreakContractSettlement")
+    Result saveBreakContractSettlement(@RequestBody @Validated BreakContractSettlementGenerateAction action);
+
 }

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

 package com.clx.performance.controller.feign;
 
+import com.clx.open.sdk.request.action.BreakContractSettlementGenerateAction;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
+import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRuleService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.vo.pc.breakcontract.carrier.BreakContractOwnerRuleVO;
@@ -25,6 +27,10 @@ public class BreakContractSettlementOwnerFeignController {
 
     private final BreakContractOwnerRuleService breakContractOwnerRuleService;
 
+    private final BreakContractOwnerRecordService breakContractOwnerRecordService;
+
+
+
 
     @ApiOperation(value = "货主订单吨数下调自动保存违约结算单")
     @PostMapping("/saveSettlementOwnerForTonnageDown")
@@ -39,4 +45,11 @@ public class BreakContractSettlementOwnerFeignController {
         return Result.ok(breakContractOwnerRuleService.getRuleInfo(id));
     }
 
+    @ApiOperation(value = "货主客户端货主确认生成违约结算单")
+    @PostMapping("/saveBreakContractSettlement")
+    Result saveBreakContractSettlement(@RequestBody @Validated BreakContractSettlementGenerateAction param){
+        breakContractOwnerRecordService.generateBreakContractSettlement(param.getBreakContractId());
+        return Result.ok();
+    }
+
 }