Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-22 11c098089f8c4714188e91032e5a19e8fe94bf96

Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

# Conflicts:
#	fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -528,7 +528,6 @@
        try {

            record = integralGetService.addEventStatistic(uid, event, null);

        } catch (IntegralGetException e) {

            e.printStackTrace();

        }

        if (record == null) {

            out.print(JsonUtil.loadFalseResult("添加失败"));


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -10,6 +10,7 @@
import java.util.regex.Pattern;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Controller;

@@ -34,6 +35,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

import com.yeshi.fanli.exception.integral.IntegralGetException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.user.TokenRecordException;

import com.yeshi.fanli.log.LogHelper;

@@ -41,6 +43,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.config.SuperHotSearchService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

@@ -110,9 +113,12 @@


    @Resource(name = "taskExecutor")

    private TaskExecutor executor;

	


    @Resource

    private TokenRecordService tokenRecordService;



    @Resource

    private IntegralGetService integralGetService;



    /**

     * 粘贴板信息推荐

@@ -130,7 +136,7 @@
        }

        // 去除前后空格

        text = text.trim();

		


        try {

            TokenVO tokenVO = tokenRecordService.discernToken(text, uid);

            out.print(JsonUtil.loadTrueResult(tokenVO));

@@ -142,7 +148,6 @@
            }

        }




        TaoBaoGoodsBrief tb = null;

        String URL_REGEX = "(((http|https)://)|(www\\.))[a-zA-Z0-9\\._-]+\\.[a-zA-Z]{2,6}(:[0-9]{1,4})?(/[a-zA-Z0-9\\&%_\\./-~-]*)?";



@@ -243,10 +248,9 @@
            return;

        }





        JSONObject data = new JSONObject();

		
        if(VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {



        if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) {

            if (tb != null) {

                TaoBaoGoodsBrief goodsBrief = null;

                try {

@@ -265,11 +269,12 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                    .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            data.put("type", 3);

            data.put("goods", gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

            data.put("goods",

                    gson.toJson(GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate)));

            out.print(JsonUtil.loadTrueResult(data));

            return;

        }

		


        if (tb != null) {

            commonGoods = new CommonGoods();

            commonGoods.setPrice(tb.getZkPrice());

@@ -278,7 +283,7 @@
            commonGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);

            commonGoods.setPicture(tb.getPictUrl());

        }

		


        JSONObject taoBaoGoodsJSON = new JSONObject();

        taoBaoGoodsJSON.put("title", commonGoods.getTitle());

        taoBaoGoodsJSON.put("zkPrice", commonGoods.getPrice() + "");

@@ -339,9 +344,9 @@
        return false;

    }



	
    /**

     * 口令领取

     * 
     * @param acceptData

     * @param kw

     * @param goodsType

@@ -356,9 +361,7 @@
            out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));

        }

    }

	
	
	


    /**

     * 搜索候选词

     * 

@@ -411,7 +414,7 @@
     */

    @RequestMapping(value = "searchGoods")

    public void searchGoods(AcceptData acceptData, Integer goodsType, String key, Integer page, String filter,

            Integer order, PrintWriter out) {

            Integer order, Long uid, HttpSession session, PrintWriter out) {

        if (goodsType == null || goodsType < 1 || goodsType > 3) {

            out.print(JsonUtil.loadFalseResult(1, "请传递正确平台参数"));

            return;

@@ -428,6 +431,30 @@
        }

        final String searchkey = key.trim();



        if (uid != null) {

            if (page == 1) {

                session.setAttribute("searchFirstTime", System.currentTimeMillis());

            } else if (page == 2) {

                Long lastTime = (Long) session.getAttribute("searchFirstTime");

                if (lastTime != null && System.currentTimeMillis() - lastTime >= 15 * 1000L) {// 超过15s浏览

				
                    ThreadUtil.run(new Runnable() {



                        @Override

                        public void run() {

                            try {

                                // 增加金币

                                integralGetService.addSearchResultScan(uid,key);

                            } catch (IntegralGetException e) {

                                e.printStackTrace();

                            }

                        }

                    });



                }

            }

        }



        executor.execute(new Runnable() {

            @Override

            public void run() {


 fanli/src/main/java/com/yeshi/fanli/mapping/integral/IntegralTaskRecordMapper.xml

@@ -1,181 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">



<mapper namespace="com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRecordMapper">

    <resultMap id="BaseResultMap"

        type="com.yeshi.fanli.entity.integral.IntegralTaskRecord">

        <id column="ir_id" property="id" jdbcType="BIGINT" />

        <result column="ir_cid" property="cid" jdbcType="BIGINT" />

        <result column="ir_task_id" property="taskId" jdbcType="BIGINT" />

        <result column="ir_uid" property="uid" jdbcType="BIGINT" />

        <result column="ir_gold_coin" property="goldCoin" jdbcType="INTEGER" />

        <result column="ir_state" property="state" jdbcType="INTEGER" />

        <result column="ir_create_time" property="createTime" jdbcType="TIMESTAMP" />

        <result column="ir_update_time" property="updateTime" jdbcType="TIMESTAMP" />



        <result column="taskName" property="taskName" jdbcType="VARCHAR" />

    </resultMap>

    <sql id="Base_Column_List">ir_id,ir_cid,ir_task_id,ir_uid,ir_gold_coin,ir_state,ir_create_time,ir_update_time

    </sql>

    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

        parameterType="java.lang.Long">

        select

        <include refid="Base_Column_List" />

        from yeshi_ec_integral_task_record where ir_id = #{id,jdbcType=BIGINT}

<mapper namespace="com.yeshi.fanli.dao.mybatis.integral.IntegralTaskRecordMapper">
    <resultMap id="BaseResultMap"
        type="com.yeshi.fanli.entity.integral.IntegralTaskRecord">
        <id column="ir_id" property="id" jdbcType="BIGINT" />
        <result column="ir_cid" property="cid" jdbcType="BIGINT" />
        <result column="ir_task_id" property="taskId" jdbcType="BIGINT" />
        <result column="ir_uid" property="uid" jdbcType="BIGINT" />
        <result column="ir_gold_coin" property="goldCoin" jdbcType="INTEGER" />
        <result column="ir_state" property="state" jdbcType="INTEGER" />
        <result column="ir_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="ir_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <result column="taskName" property="taskName" jdbcType="VARCHAR" />
    </resultMap>
    <sql id="Base_Column_List">ir_id,ir_cid,ir_task_id,ir_uid,ir_gold_coin,ir_state,ir_create_time,ir_update_time
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
        parameterType="java.lang.Long">
        select
        <include refid="Base_Column_List" />
        from yeshi_ec_integral_task_record where ir_id = #{id,jdbcType=BIGINT}
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_integral_task_record where ir_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord"
        useGeneratedKeys="true" keyProperty="id">insert into
        yeshi_ec_integral_task_record
        (ir_id,ir_cid,ir_task_id,ir_uid,ir_gold_coin,ir_state,ir_create_time,ir_update_time)
        values
        (#{id,jdbcType=BIGINT},#{cid,jdbcType=BIGINT},#{taskId,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{goldCoin,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
    </insert>
    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord"
        useGeneratedKeys="true" keyProperty="id">
        insert into yeshi_ec_integral_task_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">ir_id,</if>
            <if test="cid != null">ir_cid,</if>
            <if test="taskId != null">ir_task_id,</if>
            <if test="uid != null">ir_uid,</if>
            <if test="goldCoin != null">ir_gold_coin,</if>
            <if test="state != null">ir_state,</if>
            <if test="createTime != null">ir_create_time,</if>
            <if test="updateTime != null">ir_update_time,</if>
        </trim>
        values
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id,jdbcType=BIGINT},</if>
            <if test="cid != null">#{cid,jdbcType=BIGINT},</if>
            <if test="taskId != null">#{taskId,jdbcType=BIGINT},</if>
            <if test="uid != null">#{uid,jdbcType=BIGINT},</if>
            <if test="goldCoin != null">#{goldCoin,jdbcType=INTEGER},</if>
            <if test="state != null">#{state,jdbcType=INTEGER},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
        </trim>
    </insert>
    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord">update
        yeshi_ec_integral_task_record set ir_cid =
        #{cid,jdbcType=BIGINT},ir_task_id = #{taskId,jdbcType=BIGINT},ir_uid =
        #{uid,jdbcType=BIGINT},ir_gold_coin =
        #{goldCoin,jdbcType=INTEGER},ir_state =
        #{state,jdbcType=INTEGER},ir_create_time =
        #{createTime,jdbcType=TIMESTAMP},ir_update_time =
        #{updateTime,jdbcType=TIMESTAMP} where ir_id = #{id,jdbcType=BIGINT}
    </update>
    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord">
        update yeshi_ec_integral_task_record
        <set>
            <if test="cid != null">ir_cid=#{cid,jdbcType=BIGINT},</if>
            <if test="taskId != null">ir_task_id=#{taskId,jdbcType=BIGINT},</if>
            <if test="uid != null">ir_uid=#{uid,jdbcType=BIGINT},</if>
            <if test="goldCoin != null">ir_gold_coin=#{goldCoin,jdbcType=INTEGER},</if>
            <if test="state != null">ir_state=#{state,jdbcType=INTEGER},</if>
            <if test="createTime != null">ir_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">ir_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
        </set>
        where ir_id = #{id,jdbcType=BIGINT}
    </update>


    <update id="updateReceived" parameterType="Long">
        UPDATE
        yeshi_ec_integral_task_record SET ir_state = 1,ir_update_time = NOW()
        WHERE ir_state = 0 AND ir_uid = #{uid}
    </update>


    <select id="listNotReceived" resultMap="BaseResultMap">
        SELECT tc.`tc_name` AS
        taskName,d.* FROM yeshi_ec_integral_task_record d
        LEFT JOIN
        `yeshi_ec_integral_task_class` tc ON tc.`tc_id` = d.`ir_cid`
        WHERE
        d.`ir_uid` = #{uid} AND d.ir_state = 0
        ORDER BY d.ir_create_time
        LIMIT
        #{count}
    </select>

    <select id="listNotReceivedExcludeId" resultMap="BaseResultMap">
        SELECT tc.`tc_name` AS taskName,d.* FROM yeshi_ec_integral_task_record
        d
        LEFT JOIN `yeshi_ec_integral_task_class` tc ON tc.`tc_id` =
        d.`ir_cid`
        WHERE d.`ir_uid` = #{uid} AND d.ir_state = 0
        <if test="list != null">
            AND d.ir_id not in
            <foreach collection="list" item="item" open="(" separator=","
                close=")">
                ${item}
            </foreach>
        </if>
        ORDER BY d.ir_create_time
        LIMIT #{count}
    </select>

    <select id="getTotalGoldCoin" resultType="Integer">
        SELECT IFNULL(SUM(tr.`ir_gold_coin`),0) FROM
        yeshi_ec_integral_task_record tr
        WHERE tr.ir_uid = #{uid} AND
        tr.`ir_cid`=#{cid} <!-- tr.ir_state <![CDATA[<>]]>2 AND -->
        <if test="dateType == 1">
            AND TO_DAYS(tr.ir_create_time) = TO_DAYS(NOW())
        </if>
    </select>

    <select id="countFinished" resultType="Integer">
        SELECT IFNULL(COUNT(tr.`ir_id`),0) FROM yeshi_ec_integral_task_record
        tr
        WHERE tr.ir_uid = #{uid} AND tr.`ir_cid`=#{cid}
        <if test="dateType == 1">
            AND TO_DAYS(tr.ir_create_time) = TO_DAYS(NOW())
        </if>
    </select>

    <select id="listDaySignRecord" resultMap="BaseResultMap">
        SELECT * FROM yeshi_ec_integral_task_record d
        WHERE d.`ir_uid` = #{uid}
        <if test="cid!=null">
            and d.ir_cid=#{cid}
        </if>

        AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]>
        DATE(d.ir_create_time)
        ORDER BY d.ir_create_time desc
    </select>


    <select id="countTotalGoldCoin" resultType="Integer">
        SELECT
        IFNULL(SUM(d.`ir_gold_coin`),0) FROM `yeshi_ec_integral_task_record`
        d
        WHERE d.`ir_uid` = #{uid} AND d.`ir_state` = 0
    </select>


    <select id="countGetCountByTaskIdAndDay" resultType="Integer">
        SELECT count(*) FROM `yeshi_ec_integral_task_record`
        d
        WHERE
        d.ir_task_id = #{taskId}
        <if test="uid!=null">
            and ir_uid=#{uid}
        </if>

        <if test="minTime!=null">
            and ir_create_time>=#{minTime}
        </if>

        <if test="maxTime!=null">
            and #{maxTime}>ir_create_time
        </if>
    </select>

    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from

        yeshi_ec_integral_task_record where ir_id = #{id,jdbcType=BIGINT}

    </delete>

    <insert id="insert" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord"

        useGeneratedKeys="true" keyProperty="id">insert into

        yeshi_ec_integral_task_record

        (ir_id,ir_cid,ir_task_id,ir_uid,ir_gold_coin,ir_state,ir_create_time,ir_update_time)

        values

        (#{id,jdbcType=BIGINT},#{cid,jdbcType=BIGINT},#{taskId,jdbcType=BIGINT},#{uid,jdbcType=BIGINT},#{goldCoin,jdbcType=INTEGER},#{state,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})

    </insert>

    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord"

        useGeneratedKeys="true" keyProperty="id">

        insert into yeshi_ec_integral_task_record

        <trim prefix="(" suffix=")" suffixOverrides=",">

            <if test="id != null">ir_id,</if>

            <if test="cid != null">ir_cid,</if>

            <if test="taskId != null">ir_task_id,</if>

            <if test="uid != null">ir_uid,</if>

            <if test="goldCoin != null">ir_gold_coin,</if>

            <if test="state != null">ir_state,</if>

            <if test="createTime != null">ir_create_time,</if>

            <if test="updateTime != null">ir_update_time,</if>

        </trim>

        values

        <trim prefix="(" suffix=")" suffixOverrides=",">

            <if test="id != null">#{id,jdbcType=BIGINT},</if>

            <if test="cid != null">#{cid,jdbcType=BIGINT},</if>

            <if test="taskId != null">#{taskId,jdbcType=BIGINT},</if>

            <if test="uid != null">#{uid,jdbcType=BIGINT},</if>

            <if test="goldCoin != null">#{goldCoin,jdbcType=INTEGER},</if>

            <if test="state != null">#{state,jdbcType=INTEGER},</if>

            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>

            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

        </trim>

    </insert>

    <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord">update

        yeshi_ec_integral_task_record set ir_cid =

        #{cid,jdbcType=BIGINT},ir_task_id = #{taskId,jdbcType=BIGINT},ir_uid =

        #{uid,jdbcType=BIGINT},ir_gold_coin =

        #{goldCoin,jdbcType=INTEGER},ir_state =

        #{state,jdbcType=INTEGER},ir_create_time =

        #{createTime,jdbcType=TIMESTAMP},ir_update_time =

        #{updateTime,jdbcType=TIMESTAMP} where ir_id = #{id,jdbcType=BIGINT}

    </update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.integral.IntegralTaskRecord">

        update yeshi_ec_integral_task_record

        <set>

            <if test="cid != null">ir_cid=#{cid,jdbcType=BIGINT},</if>

            <if test="taskId != null">ir_task_id=#{taskId,jdbcType=BIGINT},</if>

            <if test="uid != null">ir_uid=#{uid,jdbcType=BIGINT},</if>

            <if test="goldCoin != null">ir_gold_coin=#{goldCoin,jdbcType=INTEGER},</if>

            <if test="state != null">ir_state=#{state,jdbcType=INTEGER},</if>

            <if test="createTime != null">ir_create_time=#{createTime,jdbcType=TIMESTAMP},</if>

            <if test="updateTime != null">ir_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

        </set>

        where ir_id = #{id,jdbcType=BIGINT}

    </update>





    <update id="updateReceived" parameterType="Long">

        UPDATE

        yeshi_ec_integral_task_record SET ir_state = 1,ir_update_time = NOW()

        WHERE ir_state = 0 AND ir_uid = #{uid}

    </update>





    <select id="listNotReceived" resultMap="BaseResultMap">

        SELECT tc.`tc_name` AS

        taskName,d.* FROM yeshi_ec_integral_task_record d

        LEFT JOIN

        `yeshi_ec_integral_task_class` tc ON tc.`tc_id` = d.`ir_cid`

        WHERE

        d.`ir_uid` = #{uid} AND d.ir_state = 0

        ORDER BY d.ir_create_time

        LIMIT

        #{count}

    </select>



    <select id="listNotReceivedExcludeId" resultMap="BaseResultMap">

        SELECT tc.`tc_name` AS taskName,d.* FROM yeshi_ec_integral_task_record

        d

        LEFT JOIN `yeshi_ec_integral_task_class` tc ON tc.`tc_id` =

        d.`ir_cid`

        WHERE d.`ir_uid` = #{uid} AND d.ir_state = 0

        <if test="list != null">

            AND d.ir_id not in

            <foreach collection="list" item="item" open="(" separator=","

                close=")">

                ${item}

            </foreach>

        </if>

        ORDER BY d.ir_create_time

        LIMIT #{count}

    </select>



    <select id="getTotalGoldCoin" resultType="Integer">

        SELECT IFNULL(SUM(tr.`ir_gold_coin`),0) FROM

        yeshi_ec_integral_task_record tr

        WHERE tr.ir_uid = #{uid} AND

        tr.`ir_cid`=#{cid} <!-- tr.ir_state <![CDATA[<>]]>2 AND -->

        <if test="dateType == 1">

            AND TO_DAYS(tr.ir_create_time) = TO_DAYS(NOW())

        </if>

    </select>



    <select id="countFinished" resultType="Integer">

        SELECT IFNULL(COUNT(tr.`ir_id`),0) FROM yeshi_ec_integral_task_record

        tr

        WHERE tr.ir_uid = #{uid} AND tr.`ir_cid`=#{cid}

        <if test="dateType == 1">

            AND TO_DAYS(tr.ir_create_time) = TO_DAYS(NOW())

        </if>

    </select>



    <select id="listDaySignRecord" resultMap="BaseResultMap">

        SELECT * FROM yeshi_ec_integral_task_record d

        WHERE d.`ir_uid` = #{uid}

        <if test="cid!=null">

            and d.ir_cid=#{cid}

        </if>



        AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) <![CDATA[<=]]>

        DATE(d.ir_create_time)

        ORDER BY d.ir_create_time desc

    </select>





    <select id="countTotalGoldCoin" resultType="Integer">

        SELECT

        IFNULL(SUM(d.`ir_gold_coin`),0) FROM `yeshi_ec_integral_task_record`

        d

        WHERE d.`ir_uid` = #{uid} AND d.`ir_state` = 0

    </select>





    <select id="countGetCountByTaskIdAndDay" resultType="Integer">

        SELECT count(*) FROM `yeshi_ec_integral_task_record`

        d

        WHERE

        d.ir_task_id = #{taskId}

        <if test="uid!=null">

            and ir_uid=#{uid}

        </if>



        <if test="minTime!=null">

            and ir_create_time>=#{minTime}

        </if>



        <if test="maxTime!=null">

            and #{maxTime}>ir_uid

        </if>

    </select>





    <select id="countByTaskIdTodayNum" resultType="Integer">

        SELECT IFNULL(COUNT(tr.`ir_id`),0) FROM yeshi_ec_integral_task_record tr


 fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java

@@ -145,7 +145,7 @@
        } else if (type == CommonContentTypeEnum.chaoPinReMai) {

            navList = getCommonNav();

        } else if (type == CommonContentTypeEnum.mianDan) {

            navList = getCommonNav();

            navList = new ArrayList<>();

        }



        return navList;


 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java

@@ -4,6 +4,7 @@


import javax.annotation.Resource;



import org.springframework.cache.annotation.Cacheable;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.entity.integral.IntegralTask;

@@ -14,6 +15,7 @@
import com.yeshi.fanli.service.inter.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskService;

import com.yeshi.fanli.util.RedisManager;



import net.sf.json.JSONObject;



@@ -25,6 +27,9 @@


    @Resource

    private IntegralTaskRecordService integralTaskRecordService;



    @Resource

    private RedisManager redisManager;



    @Override

    public IntegralTaskRecord addEventStatistic(Long uid, String event, JSONObject params) throws IntegralGetException {

@@ -84,15 +89,14 @@


    }



    @Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+kw")

    @Override

    public void addSearchResultScan(Long uid) throws IntegralGetException {

        // TODO Auto-generated method stub



    public void addSearchResultScan(Long uid, String kw) throws IntegralGetException {

        System.out.println("搜索");

    }



    @Override

    public void addShareInvite(Long uid) throws IntegralGetException {

        // TODO Auto-generated method stub



    }




 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralGetService.java

@@ -39,7 +39,7 @@
     * @param uid

     * @throws IntegralGetException

     */

    public void addSearchResultScan(Long uid) throws IntegralGetException;

    public void addSearchResultScan(Long uid,String kw) throws IntegralGetException;



    /**

     * 分享邀请图