yujian
2019-05-13 ca81ac257960fcb135fe542a49c28bc871b14e2a
Merge remote-tracking branch 'origin/master' into master_develop

Conflicts:
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/dataoke/DaTaoKeGoodsDetailService.java
3个文件已修改
68 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/dataoke/DaTaoKeDetailMapper.xml 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -1602,6 +1602,8 @@
            if ("ios".equalsIgnoreCase(platform)) {
                root.put("htmlLink", configService.get("index_html_link_ios"));
            }
            root.put("spikeGoods",  getSpikeGoodsContent(acceptData));
            out.print(JsonUtil.loadTrueResult(root));
        } catch (Exception e) {
@@ -1648,15 +1650,7 @@
        return swiperList;
    }
    /**
     * 限时秒杀 1.5.3
     *
     * @param acceptData
     * @param out
     */
    @RequestMapping(value = "getSpikeGoods")
    public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
    private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
        // 下一次倒计时的时间
        int type = qualityFlashSaleService.getNowType() + 1;
        int hour = 0;
@@ -1745,6 +1739,19 @@
        root.put("listgoods", array);
        root.put("params", params);
        root.put("jumpDetail", jumpDetail);
        return root;
    }
    /**
     * 限时秒杀 1.5.3
     *
     * @param acceptData
     * @param out
     */
    @RequestMapping(value = "getSpikeGoods")
    public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
        JSONObject root = getSpikeGoodsContent(acceptData);
        out.print(JsonUtil.loadTrueResult(root));
    }
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
@@ -66,4 +66,25 @@
     */
    List<DaTaoKeDetail> listByDtitle(String dtitle);
    /**
     * 根据标题与分类搜索列表
     *
     * @param title
     * @param cid
     * @param start
     * @param count
     * @return
     */
    List<DaTaoKeDetail> listSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid,
            @Param("start") long start, @Param("count") int count);
    /**
     * 根据标题与分类获取搜索列表数量
     *
     * @param title
     * @param cid
     * @return
     */
    Long countSearchByTitleWithCid(@Param("title") String key, @Param("cid") Long cid);
}
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/dataoke/DaTaoKeDetailMapper.xml
@@ -91,6 +91,28 @@
    </select>
    <select id="listSearchByTitleWithCid" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_goods_dataoke where (d_title like '%${title}%' or title
        like '%${title}%')
        <if test="cid!=null">
            and cid=#{cid}
        </if>
        order by update_time desc limit #{start},#{count}
    </select>
    <select id="countSearchByTitleWithCid" resultType="java.lang.Long">
        select
        count(id)
        from yeshi_ec_goods_dataoke where (d_title like
        '%${title}%' or `title` like '%${title}%')
        <if test="cid!=null">
            and cid=#{cid}
        </if>
    </select>
    <delete id="deleteByIdList">
        delete from