Merge remote-tracking branch 'origin/master'

Administrator

2018-11-21 9f2b31fa43f74dd6a04c2f3fa3af4d8fab6cd588

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsClassController.java

@@ -516,6 +516,7 @@
                // 设置SearchFilter

                taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                        totalSales);

                searchfilter.setEndPrice(new BigDecimal(10000));

            }



            searchfilter.setPage(pageNo);


 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java

@@ -2,6 +2,8 @@


import java.util.List;



import net.sf.json.JSONObject;



import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserInfo;



@@ -147,5 +149,67 @@
    public List<ThreeSale> listSuperiorQuery(long start, int count, Integer state, Long uid);

    

    public long countSuperiorQuery(Integer state, Long uid);



    /**

     * app端一级查询1.4.1

     * @param start

     * @param count

     * @param uid

     * @return

     */

    public List<ThreeSale> listFirstTeam(long start, int count, Long uid);



    /**

     * 统计所有一级队员

     * @param uid

     * @param state  状态，值 为空时则统计所有

     * @return

     */

    public long countFirstTeam(Long uid, Integer state);

	
	 
    /**

     * app端二级查询1.4.1

     * @param start

     * @param count

     * @param uid

     * @return

     */

    public List<ThreeSale> listSecondTeam(long start, int count, Long uid);



    /**

        * 统计二级队员

        * @param uid

        * @param state  状态，值 为空时则统计所有

        * @return

        */

    public long countSecondTeam(Long uid, Integer state);

    



    /**

     * 前端查询一级队员

     * @param start

     * @param count

     * @param uid

     * @return

     */

    public JSONObject getMyFirstTeam(long start, int count, Long uid);

	
	
    /**

     * 前端查询二级队员

     * @param start

     * @param count

     * @param uid

     * @return

     */

    public JSONObject getMySecondTeam(long start, int count, Long uid);

	
    /**

     * 获取上级

     * @param uid

     * @return

     */

    public ThreeSale getMyBoss(Long uid);



}