解决代码冲突

performance-web/src/main/java/com/clx/performance/extranal/order/InvoicingCompanyService.java

@@ -6,4 +6,7 @@ import com.msl.common.base.Optional;
 public interface InvoicingCompanyService {
 
     Optional<InvoicingCompanyVO> getInvoicingCompany(int  id);
+
+    InvoicingCompanyVO getInvoicingCompanyByGroupCode(String companyGroupCode);
+
 }

performance-web/src/main/java/com/clx/performance/extranal/order/impl/InvoicingCompanyImpl.java

-package com.clx.performance.extranal.order.impl;
-
-import com.clx.order.feign.InvoicingCompanyFeign;
-import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
-import com.clx.performance.extranal.order.InvoicingCompanyService;
-import com.msl.common.base.Optional;
-import com.msl.common.result.Result;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-@AllArgsConstructor
-public class InvoicingCompanyImpl  implements InvoicingCompanyService {
-    private final InvoicingCompanyFeign invoicingCompanyFeign;
-
-
-    @Override
-    public Optional<InvoicingCompanyVO> getInvoicingCompany(int  id) {
-        return Optional.ofNullable(invoicingCompanyFeign.getInvoicingCompany(id))
-                .filter(Result::succeed)
-                .map(Result::getData);
-    }
-}

performance-web/src/main/java/com/clx/performance/extranal/order/impl/InvoicingCompanyServiceImpl.java

@@ -15,6 +15,12 @@ public class InvoicingCompanyServiceImpl implements InvoicingCompanyService {
     @Autowired
     private InvoicingCompanyFeign invoicingCompanyFeign;
 
+    @Override
+    public Optional<InvoicingCompanyVO> getInvoicingCompany(int  id) {
+        return Optional.ofNullable(invoicingCompanyFeign.getInvoicingCompany(id))
+                .filter(Result::succeed)
+                .map(Result::getData);
+    }
 
     @Override
     public InvoicingCompanyVO getInvoicingCompanyByGroupCode(String companyGroupCode) {