Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-api/src/main/java/com/clx/performance/param/pc/OrderCancelParam.java

@@ -17,4 +17,7 @@ public class OrderCancelParam {
 
     @ApiModelProperty("1:平台  2：货主")
     private Integer createByType;
+
+    @ApiModelProperty("取消原因")
+    private String cancelReason;
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.order.enums.OrderEnum;
 import com.clx.order.feign.OrderFeign;
+import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.constant.RabbitKeyConstants;
@@ -20,6 +21,8 @@ import com.clx.performance.param.pc.OrderCancelParam;
 import com.clx.performance.service.OrderCancelService;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -655,6 +658,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");
 
         }
+        OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
+        orderCancelReasonParam.setOrderNo(orderNo);
+        orderCancelReasonParam.setReason(param.getCancelReason());
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
+        orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
+
+        orderFeign.orderCancelReason(orderCancelReasonParam);
 
         log.info("执行货主订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
 
@@ -752,7 +763,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         }
 
         log.info("执行承运端订单取消前置：更改相关状态完毕，开始执行吨数回填，发送MQ消息,订单No {}", orderNo);
-
+        OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
+        orderCancelReasonParam.setOrderNo(orderNo);
+        orderCancelReasonParam.setReason(param.getCancelReason());
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
+        orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
+
+        orderFeign.orderCancelReason(orderCancelReasonParam);
         Message message = MessageBuilder.withBody(JSONUtil.parse(param).toString().getBytes()).build();
         rabbitTemplate.send(
                 RabbitKeyConstants.ORDER_CANCEL_EXCHANGE, RabbitKeyConstants.ORDER_CANCEL_ROUTE_KEY, message