修改错误

applications/commons/commons-api/pom.xml

@@ -11,5 +11,18 @@
 
     <artifactId>commons-api</artifactId>
 
-
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>commons-dto</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+    </dependencies>
 </project>

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/ProductServiceImpl.java → applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -1,10 +1,8 @@
-package com.usoftchina.saas.document.service.Impl;
+package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-
-
 import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
@@ -12,7 +10,6 @@ import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.mapper.ProductMapper;
 import com.usoftchina.saas.document.service.ProductService;
 import com.usoftchina.saas.page.PageRequest;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -20,9 +17,6 @@ import java.util.List;
 @Service
 public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Product> implements ProductService {
 
-    @Autowired
-    private ProductMapper productMapper;
-
     @Override
     public PageInfo<ProductDTO> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO) {
         //设置分页
@@ -32,7 +26,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<ProductDTO> productList = productMapper.getProductsByCondition(docReqDTO);
+        List<ProductDTO> productList = getMapper().getProductsByCondition(docReqDTO);
         //取分页信息
         PageInfo<ProductDTO> pageInfo = new PageInfo<ProductDTO>(productList);
         return pageInfo;
@@ -40,18 +34,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
 
     @Override
     public List<ComboDTO> getProdUnit() {
-        return productMapper.getProdUnit();
+        return getMapper().getProdUnit();
     }
 
     @Override
     public void updateLatestPurchasePrice(Long pu_id) {
-        productMapper.updateLatestPurchasePrice(pu_id);
+        getMapper().updateLatestPurchasePrice(pu_id);
     }
 
     @Override
     public Product getProductsByPK(Long id) {
         if (null == id) {
-            return productMapper.selectByPrimaryKey(id);
+            return getMapper().selectByPrimaryKey(id);
         }
         return null;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/VendorServiceImpl.java → applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -1,17 +1,15 @@
-package com.usoftchina.saas.document.service.Impl;
+package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-
 import com.usoftchina.saas.commons.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
-
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -23,10 +21,6 @@ import java.util.List;
 @Service
 public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendor> implements VendorService {
 
-    @Autowired
-    private VendorMapper vendorMapper;
-
-
     @Override
     public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO) {
         //设置分页
@@ -36,7 +30,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<VendorDTO> vendorList = vendorMapper.getVendorsByCondition(docReqDTO);
+        List<VendorDTO> vendorList = BeanMapper.mapList(getMapper().getVendorsByCondition(docReqDTO), VendorDTO.class);
         //取分页信息
         PageInfo<VendorDTO> pageInfo = new PageInfo<VendorDTO>(vendorList);
         return pageInfo;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/WarehouseServiceImpl.java → applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -1,12 +1,10 @@
-package com.usoftchina.saas.document.service.Impl;
+package com.usoftchina.saas.document.service.impl;
 
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
-
 import com.usoftchina.saas.document.service.WarehouseService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -15,12 +13,9 @@ import java.util.Map;
 @Service
 public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
 
-    @Autowired
-    private WarehouseMapper warehouseMapper;
-
     @Override
     public void callProcedure(Map<String, Object> map){
-        warehouseMapper.callProcedure(map);
+        getMapper().callProcedure(map);
     }
 
     @Override
@@ -29,7 +24,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("companyId", companyId);
         map.put("period", period);
-        Short status = warehouseMapper.validPeriod(map);
+        Short status = getMapper().validPeriod(map);
         if(status != null && status == 0){
             return true;
         }else{
@@ -39,7 +34,7 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
 
     @Override
     public int insertSelective(Warehouse record) {
-        int count = warehouseMapper.insertSelective(record);
+        int count = getMapper().insertSelective(record);
         return count;
     }