Merge remote-tracking branch 'origin/v1.0_init_contract_20240306' into test

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

@@ -3,6 +3,7 @@ package com.clx.performance.feign;
 import com.clx.performance.param.app.collect.CollectTruckParam;
 import com.clx.performance.param.feign.OrderAdjustTonnageDownParam;
 import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.param.pc.OrderChildReportParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
 import com.clx.performance.param.pc.owner.ThawAccountParam;
@@ -67,6 +68,9 @@ public interface PerformanceFeign {
     @PostMapping(value = {"clx-performance/feign/order/orderCancel"})
     Result<Object> orderCancel(@RequestBody OrderCancelFeignParam param);
 
+    @PostMapping(value = {"clx-performance/feign/order/ownCancelOrderPre"})
+    Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param);
+
 
     /**
      * 更新货单暂停标志

performance-web/pom.xml

@@ -76,6 +76,12 @@
             <artifactId>trace-spring-boot-starter-web</artifactId>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.msl</groupId>
+            <artifactId>trace-spring-boot-starter-openfeign</artifactId>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>com.msl</groupId>-->
 <!--            <artifactId>message-api</artifactId>-->

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

@@ -2,8 +2,10 @@ package com.clx.performance.controller.feign;
 
 
 import com.clx.performance.param.pc.OrderCancelFeignParam;
+import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.result.Result;
+import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -31,4 +33,12 @@ public class OrderCancelFeignController {
         orderCancelService.ownerConfirmCancelOrderPre(param.getOrderNo());
         return Result.ok();
     }
+
+    @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
+    @PostMapping("/ownCancelOrderPre")
+    public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+        log.info("取消订单参数：{}", TokenUtil.getLoginUserInfo());
+        orderCancelService.ownerCancelOrderPre(param);
+        return Result.ok();
+    }
 }

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -119,11 +119,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     private final OwnerInfoService ownerInfoService;
 
+    private final PlatformAccountConfigService platformAccountConfigService;
+
     private final OwnerLoanAccountDao ownerLoanAccountDao;
 
     private final OwnerLoanAccountStruct ownerLoanAccountStruct;
 
-    private final PlatformAccountConfigService platformAccountConfigService;
 
     @Override
     public IPage<OwnerAccountVO> pageList(PageOwnerAccountListParam param) {