处理冲突引起的问题。

src/main/java/com/uas/platform/b2c/prod/commodity/controller/GoodsController.java

@@ -51,6 +51,7 @@ import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.*;
 import java.text.SimpleDateFormat;

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -14,14 +14,12 @@ import com.uas.platform.b2c.common.search.util.SPage;
 import com.uas.platform.b2c.core.config.SysConf;
 import com.uas.platform.b2c.core.constant.*;
 import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
 import com.uas.platform.b2c.core.utils.*;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
 import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
 import com.uas.platform.b2c.prod.commodity.constant.PublicProductUrl;
 import com.uas.platform.b2c.prod.commodity.constant.StringConstant;
 import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
-import com.uas.platform.b2c.prod.commodity.controller.GoodsController;
 import com.uas.platform.b2c.prod.commodity.dao.CommodityInOutboundDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
 import com.uas.platform.b2c.prod.commodity.dao.GoodsHistoryDao;
@@ -92,7 +90,6 @@ import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.b2c.trade.util.BoundedExecutor;
 import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -105,7 +102,6 @@ import javassist.NotFoundException;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.log4j.Logger;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.slf4j.Logger;
@@ -118,7 +114,6 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.ParameterizedPreparedStatementSetter;
 import org.springframework.jdbc.core.StatementCallback;
@@ -169,11 +164,6 @@ public class ProductServiceImpl implements ProductService {
      */
     private final Logger logger = LoggerFactory.getLogger(ProductServiceImpl.class);
 
-    /**
-     * 程序运行日志
-     */
-    private static final Logger INFO_LOGGER = Logger.getLogger(ProductServiceImpl.class);
-
     @Autowired
     private ProductDao productDao;
 
@@ -2549,19 +2539,19 @@ public class ProductServiceImpl implements ProductService {
         // 最小起订量默认为最小包装数
         Double minBuyQty = productInfo.getMinOrder() == null ? productInfo.getMinPackQty() : productInfo.getMinOrder();
         productInfo.setMinOrder(minBuyQty);
-        INFO_LOGGER.info("单个物料保存： " + FlexJsonUtils.toJson(productInfo));
+        logger.info("单个物料保存： " + FlexJsonUtils.toJson(productInfo));
         try {
             productInfo = productDao.save(productInfo);
         } catch (Exception e) {
             //如果保存报错了，判断是否是唯一约束报错。
             if (e.getMessage().contains("enuu_code")) {
                 CreateNumber tbname = createNumberDao.findByTbname("trade$product_import_num");
-                INFO_LOGGER.info("物料编号信息" + FlexJsonUtils.toJson(tbname));
+                logger.info("物料编号信息" + FlexJsonUtils.toJson(tbname));
                 List<Product> products = productDao.findByProdNum(productInfo.getProdNum());
                 if (CollectionUtils.isEmpty(products)) {
-                    INFO_LOGGER.info("重复编号，找不到对应物料" + productInfo.getProdNum());
+                    logger.info("重复编号，找不到对应物料" + productInfo.getProdNum());
                 } else {
-                    INFO_LOGGER.info("重复编号的product:" + FlexJsonUtils.toJson(products.get(0)));
+                    logger.info("重复编号的product:" + FlexJsonUtils.toJson(products.get(0)));
                 }
             }
         }