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

performance-api/pom.xml

@@ -44,6 +44,12 @@
             <groupId>com.msl</groupId>
             <artifactId>convertor-spring-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.clx.cy</groupId>
+            <artifactId>open-sdk</artifactId>
+        </dependency>
+
     </dependencies>
 
 

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

 package com.clx.performance.feign;
 
+import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.msl.common.result.Result;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -17,6 +18,6 @@ public interface PerformanceSDKFeign {
 
 
     @GetMapping(value = {"clx-performance/feign/sdk/orderCancelResidueWeight"})
-    Result<String> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType);
+    Result<OwnerCancelResidueWeightDTO> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType);
 
 }

performance-web/pom.xml

@@ -51,11 +51,6 @@
             <artifactId>message-api</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.clx.cy</groupId>
-            <artifactId>open-sdk</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.msl</groupId>
             <artifactId>user-sdk</artifactId>

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

 package com.clx.performance.controller.feign;
 
+import com.clx.open.sdk.request.dto.OwnerCancelResidueWeightDTO;
 import com.clx.performance.param.pc.OrderCancelParam;
 import com.msl.common.result.Result;
 import com.msl.user.utils.TokenUtil;
@@ -24,7 +25,7 @@ public class PerformanceSdkFeignController {
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
-    public Result<String> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+    public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
         log.info("取消订单参数：{}", TokenUtil.getLoginUserInfo());
         //orderCancelService.ownerCancelOrderPre(param);
         return Result.ok();
@@ -32,9 +33,11 @@ public class PerformanceSdkFeignController {
 
     @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")
     @GetMapping("/orderCancelResidueWeight")
-    public Result<String> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
+    public Result<OwnerCancelResidueWeightDTO> orderCancelResidueWeight(@RequestParam(value = "orderNo") String orderNo, @RequestParam(value = "optionType") String optionType) {
         log.info("当前订单可取消吨数参数：{}", TokenUtil.getLoginUserInfo());
         //orderGoodsService.orderCancelResidueWeight(orderNo,optionType);
-        return Result.ok(new BigDecimal(100).toString());
+        OwnerCancelResidueWeightDTO dto = new OwnerCancelResidueWeightDTO();
+        dto.setWeight(new BigDecimal("100").toString());
+        return Result.ok(dto);
     }
 }