Browse Source

Merge remote-tracking branch 'origin/erp_batchToGoods_20180117' into erp_batchToGoods_20180117

yangc 8 years ago
parent
commit
e93402ad3b

+ 0 - 9
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -1221,15 +1221,6 @@ public class ProductServiceImpl implements ProductService {
         if (property == null) {
             return new ResultMap(CodeType.NOT_COMPLETE_INFO.code(), "请先设置上架参数", null);
         }
-        // 暂时先不考虑数据过多的情况
-//        Integer count = productDao.findCountByEnUUAndSourceAppNotPutOn(uu, StringConstant.ERP);
-//        if (count > 1000) {
-//            pa
-//        } else {
-//            List<Product> sourceAppNotPutOn = productDao.findByEnUUAndSourceAppNotPutOn(uu, StringConstant.ERP);
-//            List<Goods> goodses = productDetailPutOn(sourceAppNotPutOn, storeName, storeid, currency, property);
-//            goodsList.addAll(goodses);
-//        }
         String sql = "select pr_id from products where pr_batchcount = 0 and pr_sourceapp = 'ERP' and pr_reserve <> 0 and pr_reserve is not null and pr_b2cenabled = 1 and pr_enuu = (:enuu) and pr_id not in (select DISTINCT go_productid from trade$goods where  go_productid is not null);";
         Map<String, Long> map = new HashMap<>();
         map.put("enuu", uu);