Browse Source

修改接口信息

hulh 7 years ago
parent
commit
cf912c2dfc

+ 1 - 1
src/main/java/com/uas/ps/product/controller/ProductController.java

@@ -104,7 +104,7 @@ public class ProductController {
 
         for (Product product : productInfo) {
             List<Product> products = productService.findByEnUUAndCmpCodeAndBrand(product.getEnUU(),product.getCmpCode(),product.getBrand());
-            if ( products == null || products.size() == 0 ) {
+            if (org.apache.commons.collections.CollectionUtils.isEmpty(products)) {
                 Product product1 = productService.save(product);
                 resultProducts.add(product1.getId());
             }

+ 6 - 1
src/main/java/com/uas/ps/product/service/impl/ProductServiceImpl.java

@@ -24,6 +24,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.client.RestTemplate;
 
@@ -117,6 +118,7 @@ public class ProductServiceImpl implements ProductService {
     }
 
     @Override
+    @Transactional
     public ModelMap matchB2cAll(Long enUU) {
         ModelMap map = new ModelMap();
         int success = 0;
@@ -246,10 +248,13 @@ public class ProductServiceImpl implements ProductService {
         ModelMap map = new ModelMap();
         List<ProductUsers> productUsers = productUsersDao.findByUseruuAndPrid(userUU,productId);
         ProductUsers productUsers1;
-        if (productUsers == null) {
+        if (CollectionUtils.isEmpty(productUsers)) {
             productUsers1 = new ProductUsers();
             productUsers1.setUseruu(userUU);
+            Product product = productDao.findOne(productId);
+            productUsers1.setEnuu(product.getEnUU());
             productUsers1.setPrid(productId);
+            productUsers1.setDate(new Date(System.currentTimeMillis()));
         } else {
             productUsers1 = productUsers.get(0);
         }