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

@@ -16,6 +16,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
 import com.clx.performance.enums.*;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.pc.OrderCancelParam;
@@ -78,6 +79,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
 
     private final SettlementOwnerDetailDao settlementOwnerDetailDao;
 
+    private final OwnerInfoService ownerInfoService;
+
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -691,6 +695,25 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         //订单取消恢复货单的剩余吨数为0
         orderGoodsService.batchUpdateResidueWeight(orderGoodsList);
 
+        //触发自动冻结的mq消费逻辑
+/*        try{
+            UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+            Long ownerUserNo = loginUserInfo.getUserNo();
+            OwnerInfoFeignVO ownerInfo = ownerInfoService.getOwnerInfo(ownerUserNo);
+            //充值成功并且当前货主是冻结方式是自动冻结，则触发自动冻结的mq监听
+            if(Objects.equals(ownerInfo.getFreezeSetting(), FreezeSettingEnum.AUTO.getCode())){
+                log.info("货主取消订单,发送自动冻结的mq消息,货主编号：{}，货主姓名：{}，订单编号：{}",ownerUserNo,loginUserInfo.getUserName(),orderNo);
+                FreezeTriggerMqParam mq = new FreezeTriggerMqParam();
+                mq.setUserNo(ownerUserNo);
+                Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(mq)).getBytes()).build();
+                //设置延时5秒处理，防止事务未提交
+                message.getMessageProperties().setExpiration("5000");
+                rabbitTemplate.send(RabbitKeyConstants.FREEZE_TRIGGER_EXCHANGE, RabbitKeyConstants.FREEZE_TRIGGER_ROUTING_KEY,message);
+            }
+        }catch (Exception e){
+            log.warn("货主取消订单，自动冻结发生异常：{}", ExceptionUtils.getStackTrace(e));
+        }*/
+
     }
 
     @Override