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

@@ -699,19 +699,17 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         orderGoodsService.batchUpdateResidueWeight(orderGoodsList);
 
         //触发自动冻结的mq消费逻辑
-        triggerAutoFreeze(orderNo);
+        triggerAutoFreeze(orderInfoFeign.getOwnerUserNo(),orderNo);
 
     }
 
     //订单取消增加自动冻结的消息触发
-    private void triggerAutoFreeze(String orderNo){
+    private void triggerAutoFreeze(Long ownerUserNo,String orderNo){
         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);
+                log.info("货主取消订单,发送自动冻结的mq消息,货主编号：{}，订单编号：{}",ownerUserNo,orderNo);
                 FreezeTriggerMqParam mq = new FreezeTriggerMqParam();
                 mq.setUserNo(ownerUserNo);
                 Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(mq)).getBytes()).build();