Merge remote-tracking branch 'origin/v7.9_small_version_fix_20231213' into test

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

@@ -2,12 +2,15 @@ package com.clx.performance.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.param.mq.FreezeTriggerMqParam;
 import com.clx.order.vo.feign.FeignOrderVO;
+import com.clx.performance.common.MqWrapper;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
 import com.clx.performance.component.OrderCancelComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
@@ -26,6 +29,8 @@ import com.clx.performance.service.*;
 import com.clx.performance.service.child.OrderChildPostService;
 import com.clx.performance.vo.app.OrderChildVO;
 import com.clx.user.enums.driver.DriverInfoEnum;
+import com.clx.user.enums.owner.FreezeSettingEnum;
+import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
@@ -33,6 +38,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -41,10 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -696,7 +699,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderGoodsService.batchUpdateResidueWeight(orderGoodsList);
 
         //触发自动冻结的mq消费逻辑
-/*        try{
+
+        triggerAutoFreeze(orderNo);
+
+    }
+
+    //订单取消增加自动冻结的消息触发
+    private void triggerAutoFreeze(String orderNo){
+        try{
             UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
             Long ownerUserNo = loginUserInfo.getUserNo();
             OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(ownerUserNo);
@@ -712,8 +722,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             }
         }catch (Exception e){
             log.warn("货主取消订单，自动冻结发生异常：{}", ExceptionUtils.getStackTrace(e));
-        }*/
-
+        }
     }
 
     @Override