Browse Source

对接模块包结构修改

chenw 7 years ago
parent
commit
9481f2ec8f
39 changed files with 78 additions and 84 deletions
  1. 9 6
      applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java
  2. 1 2
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/PurchaseApplication.java
  3. 1 1
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java
  4. 1 1
      applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java
  5. 1 2
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java
  6. 2 2
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java
  7. 2 2
      applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java
  8. 2 2
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/InquiryApi.java
  9. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/PublicProductApi.java
  10. 2 2
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/SearchApi.java
  11. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/SearchUUApi.java
  12. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Attach.java
  13. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Enterprise.java
  14. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/IPage.java
  15. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/InquiryEnRemind.java
  16. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/InquiryRemind.java
  17. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Product.java
  18. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/ProductMatchResult.java
  19. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiry.java
  20. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryItem.java
  21. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryReply.java
  22. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiry.java
  23. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryInfo.java
  24. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryItem.java
  25. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryItemInfo.java
  26. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurchaseInquiryReply.java
  27. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/User.java
  28. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/FuturesEntity.java
  29. 1 3
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/GoodsEntity.java
  30. 1 3
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/ProductEntity.java
  31. 1 3
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/QtyPrice.java
  32. 1 2
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/SearchComponentResp.java
  33. 1 1
      applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/StockEntity.java
  34. 23 23
      applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryApiTest.java
  35. 2 2
      applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryTest.java
  36. 2 2
      applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/PublicProductApiTest.java
  37. 3 3
      applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/SearchApiTest.java
  38. 2 2
      applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/SearchUUApiTest.java
  39. 1 1
      applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendProductTask.java

+ 9 - 6
applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -25,8 +25,11 @@ import com.usoftchina.saas.document.entities.*;
 import com.usoftchina.saas.document.mapper.*;
 import com.usoftchina.saas.document.service.*;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.transfers.api.SendMessageApi;
 import com.usoftchina.saas.utils.CollectionUtils;
+import com.usoftchina.saas.utils.JsonUtils;
 import com.usoftchina.saas.utils.ObjectUtils;
 import com.usoftchina.saas.utils.RegexpUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,10 +60,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     private ProductunitService productunitService;
     @Autowired
     private ProducttypeService producttypeService;
-    /*@Autowired
-    private SendMessageApi sendMessageApi;*/
-    /*@Autowired
-    private PublicProductApi publicProductApi;*/
+    @Autowired
+    private SendMessageApi sendMessageApi;
+    @Autowired
+    private PublicProductApi publicProductApi;
     @Autowired
     private CompanyApi companyApi;
     @Autowired
@@ -796,7 +799,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
      */
     @Override
     public void createProdSaler(ProductSalerDTO productSalerDTO){
-        /*Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
         Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
         ProductSalerUploadDTO productSalerUploadDTO = new ProductSalerUploadDTO(productSalerDTO.getProdId(), productSalerDTO.getProdCode(), enUU, userUU);
         if (productSalerDTO.getOperate() == 0){
@@ -807,7 +810,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             //绑定
             publicProductApi.updateProdSaler(JsonUtils.toJsonString(productSalerDTO));
             productSalerMapper.bind(productSalerDTO.getProdId(), BaseContextHolder.getUserId(), BaseContextHolder.getCompanyId());
-        }*/
+        }
     }
 
     private List<ProductReserveCostDTO> geReserveCost(ListReqDTO listReqDTO) {

+ 1 - 2
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/PurchaseApplication.java

@@ -17,8 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableTransactionManagement
-@EnableFeignClients({"com.usoftchina.saas",
-                     "com.usoftchina.inquiry"})
+@EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
 @MapperScan("com.usoftchina.saas.purchase.mapper")
 @EnableDynamicDataSource

+ 1 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -2,7 +2,7 @@ package com.usoftchina.saas.purchase.controller;
 
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;

+ 1 - 1
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/PurchaseService.java

@@ -1,7 +1,7 @@
 package com.usoftchina.saas.purchase.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;

+ 1 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java

@@ -17,8 +17,7 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @EnableEurekaClient
-@EnableFeignClients({"com.usoftchina.saas",
-                    "com.usoftchina.inquiry"})
+@EnableFeignClients("com.usoftchina.saas")
 @EnableAuthClient
 @EnableDynamicDataSource
 @ComponentScan(basePackages = {"com.usoftchina.saas"})

+ 2 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -1,8 +1,8 @@
 package com.usoftchina.saas.sale.controller;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
-import com.usoftchina.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItem;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;

+ 2 - 2
applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java

@@ -1,8 +1,8 @@
 package com.usoftchina.saas.sale.service;
 
 import com.github.pagehelper.PageInfo;
-import com.usoftchina.inquiry.po.inquiry.IPage;
-import com.usoftchina.inquiry.po.inquiry.PublicInquiryItem;
+import com.usoftchina.saas.inquiry.po.inquiry.IPage;
+import com.usoftchina.saas.inquiry.po.inquiry.PublicInquiryItem;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;

+ 2 - 2
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/InquiryApi.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/InquiryApi.java

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/PublicProductApi.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/PublicProductApi.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

+ 2 - 2
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchApi.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/SearchApi.java

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/SearchUUApi.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/api/SearchUUApi.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.api;
+package com.usoftchina.saas.inquiry.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.ui.ModelMap;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Attach.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Attach.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Enterprise.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Enterprise.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/IPage.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/IPage.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.List;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryEnRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/InquiryEnRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/InquiryRemind.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/InquiryRemind.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/Product.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/Product.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.Date;
 import java.util.Set;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/ProductMatchResult.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/ProductMatchResult.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import org.springframework.util.CollectionUtils;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PublicInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PublicInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiry.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiry.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 
 import java.io.Serializable;

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItem.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryItem.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.*;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurcInquiryItemInfo.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurcInquiryItemInfo.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.util.*;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/PurchaseInquiryReply.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/PurchaseInquiryReply.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/inquiry/User.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/inquiry/User.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.inquiry;
+package com.usoftchina.saas.inquiry.po.inquiry;
 
 import java.io.Serializable;
 

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/FuturesEntity.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/FuturesEntity.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 
 import java.io.Serializable;

+ 1 - 3
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/GoodsEntity.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/GoodsEntity.java

@@ -1,9 +1,7 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 商品信息

+ 1 - 3
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/ProductEntity.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/ProductEntity.java

@@ -1,8 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
 
 /**
  * 物料信息

+ 1 - 3
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/QtyPrice.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/QtyPrice.java

@@ -1,8 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.util.Objects;
 
 /**
  * 分段数量

+ 1 - 2
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/SearchComponentResp.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/SearchComponentResp.java

@@ -1,7 +1,6 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * 器件查询

+ 1 - 1
applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/po/search/StockEntity.java → applications/transfers/mall-api/src/main/java/com/usoftchina/saas/inquiry/po/search/StockEntity.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.po.search;
+package com.usoftchina.saas.inquiry.po.search;
 
 
 import java.io.Serializable;

+ 23 - 23
applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/InquiryApiTest.java → applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryApiTest.java

@@ -1,7 +1,7 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.InquiryApi;
-import com.usoftchina.inquiry.po.inquiry.*;
+import com.usoftchina.saas.inquiry.api.InquiryApi;
+import com.usoftchina.saas.inquiry.po.inquiry.*;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -55,41 +55,41 @@ public class InquiryApiTest {
     @Test
     public void testD_saveQuote(){
         PublicInquiryItem publicInquiryItem = new PublicInquiryItem();
-        publicInquiryItem.setSourceId(2443698L);
-        publicInquiryItem.setVendUU(10050549L);     //祝通鸿
-        publicInquiryItem.setVendUserUU(1000027410L);   //祝通鸿
+        publicInquiryItem.setSourceId(2443743L);
+        publicInquiryItem.setVendUU(10050572L);     //李剑辉
+        publicInquiryItem.setVendUserUU(1000027286L);   //李剑辉
         publicInquiryItem.setIsReplace((short) 0);
-        publicInquiryItem.setCmpCode("MT8783V");
-        publicInquiryItem.setSpec("MT8783V/CT,VFBGA641,SMD,无卤");
+        publicInquiryItem.setCmpCode("E0400010077");
+        publicInquiryItem.setSpec("");
         publicInquiryItem.setDate(new Date());
-        publicInquiryItem.setEndDate(new Date(System.currentTimeMillis() + 3 * 24 * 60 * 60 * 1000));
-        publicInquiryItem.setInbrand("MTK");
-        publicInquiryItem.setProdTitle("控制器IC");
+        publicInquiryItem.setEndDate(new Date(System.currentTimeMillis() + 2 * 24 * 60 * 60 * 1000));
+        publicInquiryItem.setInbrand("ARROW");
+        publicInquiryItem.setProdTitle("贴片电阻");
         publicInquiryItem.setQutoApp("sp");
         publicInquiryItem.setCurrency("RMB");
-        publicInquiryItem.setLeadtime(3L);
+        publicInquiryItem.setLeadtime(2L);
         publicInquiryItem.setTaxrate(0.16f);
         //分段报价信息
         List<PublicInquiryReply> replyList = new ArrayList<PublicInquiryReply>();
         PublicInquiryReply publicInquiryReply = new PublicInquiryReply();
-        publicInquiryReply.setLapQty(100.0);
-        publicInquiryReply.setPrice(23.13);
+        publicInquiryReply.setLapQty(1.0);
+        publicInquiryReply.setPrice(2.13);
         replyList.add(publicInquiryReply);
         publicInquiryReply = new PublicInquiryReply();
-        publicInquiryReply.setLapQty(200.0);
-        publicInquiryReply.setPrice(22.13);
+        publicInquiryReply.setLapQty(10000.0);
+        publicInquiryReply.setPrice(1.73);
         replyList.add(publicInquiryReply);
 
         //买家采购员信息
-        publicInquiryItem.setUserName("何炎");
-        publicInquiryItem.setUserTel("13978887888");
-        publicInquiryItem.setUserUU(1000012297L);
+        publicInquiryItem.setUserName("陈囿余");
+        publicInquiryItem.setUserTel("13538100180");
+        publicInquiryItem.setUserUU(1000006382L);
         //询价单信息
         PublicInquiry inquiry = new PublicInquiry();
-        inquiry.setId(2293571L);
-        inquiry.setEnUU(10050573L);
-        inquiry.setRecorderUU(1000012297L);
-        inquiry.setCode("sp1546790412000295579");
+        inquiry.setId(2443743L);
+        inquiry.setEnUU(10030994L);
+        inquiry.setRecorderUU(1000006382L);
+        inquiry.setCode("MALL1547178327304");
 
         publicInquiryItem.setInquiry(inquiry);
         publicInquiryItem.setReplies(replyList);

+ 2 - 2
applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/InquiryTest.java → applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/InquiryTest.java

@@ -1,4 +1,4 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @Date 2019/01/04
  */
 @SpringBootApplication(scanBasePackages = "com.usoftchina")
-@EnableFeignClients("com.usoftchina.inquiry")
+@EnableFeignClients("com.usoftchina.saas.inquiry")
 public class InquiryTest {
 
     public static void main(String[] args) {

+ 2 - 2
applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/PublicProductApiTest.java → applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/PublicProductApiTest.java

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.PublicProductApi;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;

+ 3 - 3
applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/SearchApiTest.java → applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/SearchApiTest.java

@@ -1,7 +1,7 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.SearchApi;
-import com.usoftchina.inquiry.po.search.SearchComponentResp;
+import com.usoftchina.saas.inquiry.api.SearchApi;
+import com.usoftchina.saas.inquiry.po.search.SearchComponentResp;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;
 import org.junit.Test;

+ 2 - 2
applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/SearchUUApiTest.java → applications/transfers/mall-api/src/test/java/com/usoftchina/saas/inquiry/test/SearchUUApiTest.java

@@ -1,6 +1,6 @@
-package com.usoftchina.inquiry.test;
+package com.usoftchina.saas.inquiry.test;
 
-import com.usoftchina.inquiry.api.SearchUUApi;
+import com.usoftchina.saas.inquiry.api.SearchUUApi;
 import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.FixMethodOrder;

+ 1 - 1
applications/transfers/transfers-server/src/main/java/com/usoftchina/saas/transfers/task/SendProductTask.java

@@ -1,6 +1,6 @@
 package com.usoftchina.saas.transfers.task;
 
-import com.usoftchina.inquiry.api.PublicProductApi;
+import com.usoftchina.saas.inquiry.api.PublicProductApi;
 import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.api.ProductApi;