修改merge 错误

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

@@ -83,9 +83,11 @@ public class OrderCancelComponent implements InitializingBean {
     @Autowired
     private OrderGoodsService orderGoodsService;
 
-    private final SettlementOwnerDetailDao settlementOwnerDetailDao;
+    @Autowired
+    SettlementOwnerDetailDao settlementOwnerDetailDao;
 
-    private final OwnerAccountService ownerAccountService;
+    @Autowired
+    OwnerAccountService ownerAccountService;
 
     public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();

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

@@ -12,8 +12,8 @@ import com.clx.order.param.mq.FreezeTriggerMqParam;
 import com.clx.performance.common.MqWrapper;
 import com.clx.performance.component.IdGenerateSnowFlake;
 import com.clx.performance.config.ClxMessageConfig;
-import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.constant.RabbitKeyConstants;
+import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.*;
 import com.clx.performance.enums.IdTypeEnum;
 import com.clx.performance.enums.OwnerAccountEnum;
@@ -41,8 +41,8 @@ import com.clx.performance.utils.excel.ExcelUtil;
 import com.clx.performance.vo.pc.OwnerAccountAllVO;
 import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
 import com.clx.performance.vo.pc.OwnerAccountVO;
-import com.clx.user.feign.OwnerFeign;
 import com.clx.user.enums.owner.FreezeSettingEnum;
+import com.clx.user.feign.OwnerFeign;
 import com.clx.user.feign.OwnerInfoFeign;
 import com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
@@ -57,18 +57,17 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
-import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service