Browse Source

处理因为处理存储过程注释报错的问题。

yujia 8 years ago
parent
commit
7d93c546e2

+ 8 - 8
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductImportHistServiceImpl.java

@@ -1,10 +1,9 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
+import com.uas.platform.b2c.core.constant.SplitChar;
 import com.uas.platform.b2c.prod.commodity.dao.ProductImportHistDao;
-import com.uas.platform.b2c.prod.commodity.service.ProductImportHistService;
 import com.uas.platform.b2c.prod.commodity.model.ProductImportHist;
-import com.uas.platform.b2c.core.support.SystemSession;
-import com.uas.platform.b2c.core.constant.SplitChar;
+import com.uas.platform.b2c.prod.commodity.service.ProductImportHistService;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
@@ -51,15 +50,15 @@ public class ProductImportHistServiceImpl implements ProductImportHistService {
             ProductImportHist hist = importHists.get(0);
             String uploadNum = hist.getUploadNum();
             productImportHistDao.save(importHists);
-            productImportHistDao.validProductImportInfo(uploadNum, SystemSession.getUser().getEnterprise().getUu());
-            Integer integer = productImportHistDao.importToProRepository(uploadNum);
+//            productImportHistDao.validProductImportInfo(uploadNum, SystemSession.getUser().getEnterprise().getUu());
+//            Integer integer = productImportHistDao.importToProRepository(uploadNum);
             //导入失败的条数(重复记录,信息缺失)
             List<Integer> importFailure = new ArrayList<>();
             Collections.addAll(importFailure, ProductImportHist.ProductImportStatus.INFO_PARTIAL.getCode(), ProductImportHist.ProductImportStatus.INFO_DUPLICATE.getCode());
             Integer failureC = productImportHistDao.getCountProductImport(uploadNum, importFailure);
             map.put("importError", failureC);
             //匹配成功的条数
-            map.put("success", integer);
+//            map.put("success", integer);
             map.put("uploadNum", uploadNum);
         }
         return map;
@@ -102,8 +101,9 @@ public class ProductImportHistServiceImpl implements ProductImportHistService {
         if(StringUtils.isEmpty(uploadNum)) {
             return  ResultMap.success(0);
         }
-        Integer integer = productImportHistDao.importToProRepository(uploadNum);
-        return ResultMap.success(integer);
+        // 该功能被弃用
+//        Integer integer = productImportHistDao.importToProRepository(uploadNum);
+        return ResultMap.success(0);
     }
 
     /**