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