隐藏销售的新功能

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -419,32 +419,32 @@ public class SaleOrderController {
 		return searchService.searchPurchaseWaitingOrderIds(keyword, pageParams);
 	}
 
-    /**
-     * @param params
-     * @param searchFilter
-     * @author yujia 获取待发货的订单 - 搜索
-     */
-    @RequestMapping(value = "/test", method = RequestMethod.GET)
-    @ResponseBody
-    public SPage<SaleOrderForProd> getSaleOrderItems(PageParams params, String searchFilter) {
-        logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
-        purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-                SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-        PageInfo pageInfo = new PageInfo(params);
-        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        filter = new SearchFilter();
-        SearchFilter distribute = userService.distribute();
-        if (distribute != null && distribute.getDistribute() == null) {
-            return null;
-        }
-        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
-            filter.setDistribute(distribute.getDistribute());
-        }
-        filter.setKeyword("C0100010026");
-        System.out.println(JSON.toJSON(filter));
-        SPage<SaleOrderForProd> orders = purchaseOrderService.findOrderItemsByPageInfo(pageInfo, filter);
-        return orders;
-    }
+//    /**
+//     * @param params
+//     * @param searchFilter
+//     * @author yujia 获取待发货的订单 - 搜索
+//     */
+//    @RequestMapping(value = "/test", method = RequestMethod.GET)
+//    @ResponseBody
+//    public SPage<SaleOrderForProd> getSaleOrderItems(PageParams params, String searchFilter) {
+//        logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
+//        purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
+//                SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
+//        PageInfo pageInfo = new PageInfo(params);
+//        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
+//        filter = new SearchFilter();
+//        SearchFilter distribute = userService.distribute();
+//        if (distribute != null && distribute.getDistribute() == null) {
+//            return null;
+//        }
+//        if (distribute != null && !CollectionUtils.isEmpty(distribute.getDistribute())) {
+//            filter.setDistribute(distribute.getDistribute());
+//        }
+//        filter.setKeyword("C0100010026");
+//        System.out.println(JSON.toJSON(filter));
+//        SPage<SaleOrderForProd> orders = purchaseOrderService.findOrderItemsByPageInfo(pageInfo, filter);
+//        return orders;
+//    }
 
 	/**
 	 * 作为卖家，收到的采购订单(含明细)

src/main/java/com/uas/platform/b2b/service/PurchaseOrderService.java

@@ -397,5 +397,5 @@ public interface PurchaseOrderService {
      */
     public void replyByBatch(String idString, String username, String userip, Long enuu, Long useruu);
 
-    SPage<SaleOrderForProd> findOrderItemsByPageInfo(PageInfo pageInfo, SearchFilter filter);
+//    SPage<SaleOrderForProd> findOrderItemsByPageInfo(PageInfo pageInfo, SearchFilter filter);
 }

src/main/java/com/uas/platform/b2b/service/impl/PurchaseOrderServiceImpl.java

@@ -1264,54 +1264,54 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         purchaseOrderItemDao.replyByBatch(idString, username, userip, enuu, useruu);
     }
 
-    @Override
-    public SPage<SaleOrderForProd> findOrderItemsByPageInfo(PageInfo pageInfo, SearchFilter filter) {
-        return getSaleOrders(pageInfo, filter);
-    }
-
-    private SPage<SaleOrderForProd> getSaleOrders(PageInfo pageInfo, SearchFilter filter) {
-        SPage<SaleOrderForProd> orders = new SPage<SaleOrderForProd>();
-        StringBuffer countSql = new StringBuffer("select count(1) from purc$orders left join purc$orderitems on pu_id = pd_puid left join products on pd_prid = pr_id where 1=1");
-        StringBuffer querySql = new StringBuffer(
-                "select * from (select t.*,rownum r from (select purc$orders.*,pd_id from purc$orders left join purc$orderitems on pu_id = pd_puid left join products on pd_prid = pr_id where 1=1");
-        Object[] args = new Object[] {};
-        if(null != filter.getDistribute()) {
-            filter.getDistribute().toString().replace("[", " ");
-            filter.getDistribute().toString().replace("]", " ");
-            countSql.append(" and pu_venduu in ").append(filter.getDistribute()).append("and upper(pr_title) like upper('%").append(filter.getKeyword())
-                    .append("%') or upper(pr_spec) like upper('%").append(filter.getKeyword()).append("%') or upper(pr_code) like upper('%").append(filter.getKeyword())
-                    .append("%')");
-            querySql.append(" and pu_venduu in ").append(filter.getDistribute()).append("and upper(pr_title) like upper('%").append(filter.getKeyword())
-                    .append("%') or upper(pr_spec) like upper('%").append(filter.getKeyword()).append("%') or upper(pr_code) like upper('%").append(filter.getKeyword())
-                    .append("%')");
-        }
-        int total = count(countSql.toString(), args);
-        querySql.append(" order by pu_date desc) t where rownum <= ?) where r >= ?");
-        args = Arrays.copyOf(args, args.length + 2);
-        args[args.length - 2] = pageInfo.getPageNumber() * pageInfo.getPageSize();
-        args[args.length - 1] = (pageInfo.getPageNumber() - 1) * pageInfo.getPageSize() + 1;
-        List<SaleOrderForProd> content = commonDao.getJdbcTemplate().query(querySql.toString(), getRowMapper(), args);
-        if(!CollectionUtils.isEmpty(content)) {
-            for(SaleOrderForProd order : content) {
-                List<SaleOrderForProdItem> items = new ArrayList<SaleOrderForProdItem>();
-                if(null != order.getPdid()) {
-                    SaleOrderForProdItem item = saleOrderForProdItemDao.findOne(order.getPdid());
-                    items.add(item);
-                    order.setOrderItems(items);
-                    EnterpriseInfo enterpriseInfo = enterpriseDao.findEnterpriseInfoByUu(order.getEnUU());
-                    order.setEnterprise(enterpriseInfo);
-                    UserBaseInfo userBaseInfo = userBaseInfoDao.findByUserUU(order.getUserUU());
-                    order.setUser(userBaseInfo);
-                }
-            }
-        }
-        orders.setContent(content);
-        orders.setTotalElement(total);
-        orders.setPage(pageInfo.getPageNumber());
-        orders.setSize(pageInfo.getPageSize());
-        orders.setTotalPage(content.size());
-        return orders;
-    }
+//    @Override
+//    public SPage<SaleOrderForProd> findOrderItemsByPageInfo(PageInfo pageInfo, SearchFilter filter) {
+//        return getSaleOrders(pageInfo, filter);
+//    }
+//
+//    private SPage<SaleOrderForProd> getSaleOrders(PageInfo pageInfo, SearchFilter filter) {
+//        SPage<SaleOrderForProd> orders = new SPage<SaleOrderForProd>();
+//        StringBuffer countSql = new StringBuffer("select count(1) from purc$orders left join purc$orderitems on pu_id = pd_puid left join products on pd_prid = pr_id where 1=1");
+//        StringBuffer querySql = new StringBuffer(
+//                "select * from (select t.*,rownum r from (select purc$orders.*,pd_id from purc$orders left join purc$orderitems on pu_id = pd_puid left join products on pd_prid = pr_id where 1=1");
+//        Object[] args = new Object[] {};
+//        if(null != filter.getDistribute()) {
+//            filter.getDistribute().toString().replace("[", " ");
+//            filter.getDistribute().toString().replace("]", " ");
+//            countSql.append(" and pu_venduu in ").append(filter.getDistribute()).append("and upper(pr_title) like upper('%").append(filter.getKeyword())
+//                    .append("%') or upper(pr_spec) like upper('%").append(filter.getKeyword()).append("%') or upper(pr_code) like upper('%").append(filter.getKeyword())
+//                    .append("%')");
+//            querySql.append(" and pu_venduu in ").append(filter.getDistribute()).append("and upper(pr_title) like upper('%").append(filter.getKeyword())
+//                    .append("%') or upper(pr_spec) like upper('%").append(filter.getKeyword()).append("%') or upper(pr_code) like upper('%").append(filter.getKeyword())
+//                    .append("%')");
+//        }
+//        int total = count(countSql.toString(), args);
+//        querySql.append(" order by pu_date desc) t where rownum <= ?) where r >= ?");
+//        args = Arrays.copyOf(args, args.length + 2);
+//        args[args.length - 2] = pageInfo.getPageNumber() * pageInfo.getPageSize();
+//        args[args.length - 1] = (pageInfo.getPageNumber() - 1) * pageInfo.getPageSize() + 1;
+//        List<SaleOrderForProd> content = commonDao.getJdbcTemplate().query(querySql.toString(), getRowMapper(), args);
+//        if(!CollectionUtils.isEmpty(content)) {
+//            for(SaleOrderForProd order : content) {
+//                List<SaleOrderForProdItem> items = new ArrayList<SaleOrderForProdItem>();
+//                if(null != order.getPdid()) {
+//                    SaleOrderForProdItem item = saleOrderForProdItemDao.findOne(order.getPdid());
+//                    items.add(item);
+//                    order.setOrderItems(items);
+//                    EnterpriseInfo enterpriseInfo = enterpriseDao.findEnterpriseInfoByUu(order.getEnUU());
+//                    order.setEnterprise(enterpriseInfo);
+//                    UserBaseInfo userBaseInfo = userBaseInfoDao.findByUserUU(order.getUserUU());
+//                    order.setUser(userBaseInfo);
+//                }
+//            }
+//        }
+//        orders.setContent(content);
+//        orders.setTotalElement(total);
+//        orders.setPage(pageInfo.getPageNumber());
+//        orders.setSize(pageInfo.getPageSize());
+//        orders.setTotalPage(content.size());
+//        return orders;
+//    }
 
     private int count(String sql, Object[] args) {
         return commonDao.getJdbcTemplate().queryForObject(!sql.startsWith("select") ? ("select count(1) " + sql) : sql, Integer.class, args);