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

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

@@ -18,7 +18,7 @@ public interface PerformanceSDKFeign {
 
 
     @PostMapping(value = {"clx-performance/feign/sdk/ownCancelOrderPre"})
-    Result<String> ownCancelOrderPre(@RequestBody OrderCancelParam param);
+    Result<Integer> ownCancelOrderPre(@RequestBody OrderCancelParam param);
 
 
     @GetMapping(value = {"clx-performance/feign/sdk/orderCancelResidueWeight"})

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -11,6 +11,7 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dto.OrderCancelDTO;
 import com.clx.performance.dto.OrderCancelResult;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
@@ -89,7 +90,7 @@ public class OrderCancelComponent implements InitializingBean {
      * @param param
      * @return
      */
-    public List<String> ownerProcess(OrderCancelParam param) {
+    public OrderCancelDTO ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
 
@@ -109,7 +110,8 @@ public class OrderCancelComponent implements InitializingBean {
                 orderChildPostService.orderCancel(childNo);
             }
         }
-        return childNoList;
+        return OrderCancelDTO.builder().status(orderStatusCode)
+                        .childNoList(childNoList).build();
 
     }
 

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

@@ -41,10 +41,9 @@ public class PerformanceSdkFeignController {
 
     @ApiOperation(value = "货主端取消订单", notes = "<br>By:胡宇帆")
     @PostMapping("/ownCancelOrderPre")
-    public Result<Object> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
+    public Result<Integer> ownCancelOrderPre(@RequestBody OrderCancelParam param) {
         log.info("取消订单参数：{}", param);
-        orderCancelService.ownerCancelOrderPre(param);
-        return Result.ok();
+        return Result.ok(orderCancelService.ownerCancelOrderPre(param));
     }
 
     @ApiOperation(value = "获取当前订单可取消吨数", notes = "<br>By:胡宇帆")

performance-web/src/main/java/com/clx/performance/dto/OrderCancelDTO.java

+package com.clx.performance.dto;
+
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class OrderCancelDTO {
+
+    private Integer status;
+
+    private List<String> childNoList;
+}

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

@@ -22,7 +22,7 @@ public interface OrderCancelService {
      * 货主取消订单前置（只修改订单状态）
      * @param param
      */
-    void ownerCancelOrderPre(OrderCancelParam param);
+    Integer ownerCancelOrderPre(OrderCancelParam param);
 
     /**
      * 平台取消订单前置(只修改订单状态)

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

@@ -18,6 +18,7 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dto.OrderCancelDTO;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
 import com.clx.performance.extranal.user.OwnerInfoService;
@@ -327,11 +328,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ownerCancelOrderPre(OrderCancelParam param) {
+    public Integer ownerCancelOrderPre(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
 
-        List<String> childNoList = orderCancelComponent.ownerProcess(param);
-        param.setChildNoList(childNoList);
+        OrderCancelDTO orderCancelDTO = orderCancelComponent.ownerProcess(param);
+        param.setChildNoList(orderCancelDTO.getChildNoList());
         OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
         orderCancelReasonParam.setOrderNo(orderNo);
         orderCancelReasonParam.setReason(param.getCancelReason());
@@ -357,6 +358,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         rabbitTemplate.send(
                 RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_EXCHANGE, RabbitKeyConstants.ORDER_TRUCK_BIND_LAZY_ROUTE_KEY, message2
         );
+
+        return orderCancelDTO.getStatus();
     }
 
 //    /**