免单商品调整

yujian

2019-05-31 50bcb80ed69953023aecbaa92ae9a6b4207228e0

免单商品调整

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java

@@ -1057,18 +1057,13 @@
     */

    @RequestMapping("freeGoods")

    public void freeGoods(String callback, Integer page, PrintWriter out) {



        try {

        if (page == null || page < 1)

            page = 1;



        int pageSize = Constant.PAGE_SIZE;



        double tkRate = 20;

        String lableName = "9.9";



        try {

            List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize, tkRate,

                    lableName);

            List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize);

            if (listQuery == null || listQuery.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "没有更多了"));

                return;

@@ -1143,7 +1138,7 @@
                array.add(gson.toJson(extra));

            }



            long count = qualityGoodsService.countFreeGoods(tkRate, lableName);

            long count = qualityGoodsService.countFreeGoods();



            

            JSONObject data = new JSONObject();

@@ -1155,13 +1150,10 @@
            

            data.put("count", count);

            data.put("result_list", array);

			
			
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

			
        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作失败"));

            e.printStackTrace();

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("数据暂未提供"));

            LogHelper.errorDetailInfo(e);

        }

    }

    


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/lable/QualityFactoryMapper.java

@@ -312,10 +312,9 @@
     * @param count
     * @return
     */
    List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count, 
            @Param("tkRate") Double tkRate, @Param("lableName") String lableName);
    List<QualityFactory> listFreeGoods(@Param("start") long start, @Param("count") int count);
    
    long countFreeGoods(@Param("tkRate") Double tkRate, @Param("lableName") String lableName);
    long countFreeGoods();

    
    /**

 fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml

@@ -1266,26 +1266,6 @@
        #{start},#{count}
    </select>

   <select id="listFreeGoods" resultMap="GoodsResultMap">
        SELECT * FROM `yeshi_ec_quality_factory` f 
        LEFT JOIN `yeshi_ec_taobao_goods` tg ON tg.`id` = f.`sg_goods_id`
        LEFT JOIN `yeshi_ec_label_goods` g ON g.`lg_goods_id` = f.`sg_goods_id`
        LEFT JOIN `yeshi_ec_label` lab ON lab.`lab_id` = g.`lg_label_id`
        WHERE lab.`lab_title` = #{lableName} 
             <![CDATA[AND tg.`tkRate` >= #{tkRate}]]>
        ORDER BY f.`sg_createtime` DESC 
        limit #{start},#{count}
    </select>


   <select id="countFreeGoods" resultType="java.lang.Long">
        SELECT ifnull(count(sg_id),0) FROM `yeshi_ec_quality_factory` f 
        LEFT JOIN `yeshi_ec_taobao_goods` tg ON tg.`id` = f.`sg_goods_id`
        LEFT JOIN `yeshi_ec_label_goods` g ON g.`lg_goods_id` = f.`sg_goods_id`
        LEFT JOIN `yeshi_ec_label` lab ON lab.`lab_id` = g.`lg_label_id`
        WHERE lab.`lab_title` = #{lableName} 
             <![CDATA[AND tg.`tkRate` >= #{tkRate}]]>
    </select>
    
    <select id="listByShopId" resultMap="GoodsResultMap">
        SELECT * FROM  yeshi_ec_quality_factory q
@@ -1359,4 +1339,37 @@
             AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<=]]> #{maxQuanPrice}
    </select>


     <select id="listFreeGoods" resultMap="GoodsResultMap">
         SELECT * FROM `yeshi_ec_quality_factory` h
        LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
        WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` > 0 
             AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
             <!-- 在售价  209.9 -->
             AND tb.`zkPrice` <![CDATA[<=]]> 209.9
             <!--  券后价范围  0~9.9 -->
             AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[>]]> 0
             AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<= ]]> 9.9
             <!-- 比例  20 -->
             AND  tb.`tkRate` <![CDATA[>=]]> 20
        ORDER BY h.sg_weight desc
        LIMIT ${start},${count}
    </select>


   <select id="countFreeGoods" resultType="java.lang.Long">
        SELECT IFNULL(COUNT(h.`sg_id`),0)  FROM `yeshi_ec_quality_factory` h
        LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
        WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` > 0 
             AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
             <!-- 在售价  209.9 -->
             AND tb.`zkPrice` <![CDATA[<=]]> 209.9
             <!--  券后价范围  0~9.9 -->
             AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[>]]> 0
             AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<= ]]> 9.9
             <!-- 比例  20 -->
             AND  tb.`tkRate` <![CDATA[>=]]> 20
    </select>


</mapper>

 fanli/src/main/java/com/yeshi/fanli/service/impl/lable/QualityGoodsServiceImpl.java

@@ -365,13 +365,13 @@
    }

    

    @Override

    public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName) {

        return qualityFactoryMapper.listFreeGoods(start, count, tkRate, lableName);

    public List<QualityFactory> listFreeGoods(long start, int count) {

        return qualityFactoryMapper.listFreeGoods(start, count);

    }

    

    @Override

    public long countFreeGoods(Double tkRate, String lableName) {

        return qualityFactoryMapper.countFreeGoods(tkRate, lableName);

    public long countFreeGoods() {

        return qualityFactoryMapper.countFreeGoods();

    }

    

    @Override


 fanli/src/main/java/com/yeshi/fanli/service/inter/lable/QualityGoodsService.java

@@ -162,9 +162,9 @@
     * @param lableName 标签名

     * @return

     */

    public List<QualityFactory> listFreeGoods(long start, int count, Double tkRate, String lableName);

    public List<QualityFactory> listFreeGoods(long start, int count);



    public long countFreeGoods(Double tkRate, String lableName);

    public long countFreeGoods();

    

    /**

     * 限时秒杀随机3个商品