专题时间区分

yujian

2019-09-10 c89f7ee4a03ac4eb6010f2982f9bc71986c4e75e

专题时间区分

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java

@@ -744,7 +744,9 @@
        // list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);



        // 1、活动区域

        List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");

        int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

		
        List<Special> listSpecial = specialService.listByPlaceKey("msg_activities", platformCode, Integer.parseInt(acceptData.getVersion()));

        if (listSpecial != null && listSpecial.size() > 0) {

            for (Special special : listSpecial) {




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

@@ -27,8 +27,8 @@
import com.yeshi.fanli.service.inter.jd.JDGoodsService;

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

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;



import net.sf.json.JSONArray;

@@ -102,7 +102,9 @@
            }

            root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));



            List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index");

            int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

			
            List<Special> listSpecial = specialService.listByPlaceKey("jingdong_special_index", platformCode, Integer.parseInt(acceptData.getVersion()));

            if (listSpecial == null) {

                listSpecial = new ArrayList<Special>();

            }


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

@@ -25,6 +25,7 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

import com.yeshi.fanli.service.inter.pdd.PDDGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;



@@ -94,8 +95,8 @@
                topPicList = new ArrayList<SwiperPicture>();

            }

            root.put("listPic", JsonUtil.getApiCommonGson().toJson(topPicList));

			
            List<Special> listSpecial = specialService.listByPlaceKey("pinduoduo_special_index");

            int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

            List<Special> listSpecial = specialService.listByPlaceKey("pinduoduo_special_index", platformCode, Integer.parseInt(acceptData.getVersion()));

            if (listSpecial == null) {

                listSpecial = new ArrayList<Special>();

            }


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/homemodule/SpecialMapper.java

@@ -91,7 +91,7 @@
     * @return

     */

    List<Special> listByVersion(@Param("start") long start, @Param("count") int count, 

            @Param("card") String card, @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);

            @Param("placeKey") String placeKey, @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);

    

    

    /**

@@ -110,6 +110,7 @@
     * @param systemId

     * @return

     */

    List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex);

    List<Special> listByPlaceKey(@Param("placeKey") String placeKey, @Param("sex")Integer sex

            , @Param("platform") Integer platform, @Param("versionCode") Integer versionCode);

    

}

 fanli/src/main/java/com/yeshi/fanli/mapping/homemodule/SpecialMapper.xml

@@ -316,16 +316,25 @@
    </select>



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

        SELECT p.* FROM`yeshi_ec_special` p 
        LEFT JOIN `yeshi_ec_special_card` c ON p.`b_card_id` = c.`cd_id`

        WHERE p.`b_state` = 0 AND c.`cd_state` = 0 AND c.`cd_card` = #{card}

        SELECT sp.*,c.`cd_bottom_picture` FROM `yeshi_ec_special` sp

        RIGHT JOIN 
             (SELECT c.* FROM yeshi_ec_special_card c

              LEFT JOIN `yeshi_ec_special_place` pc ON pc.`sp_id` = c.`cd_place_id`

              WHERE c.`cd_state` = 0 
                    AND IF(c.`cd_start_time` IS NULL,TRUE,c.`cd_start_time`<![CDATA[<=]]>NOW())

                    AND IF(c.`cd_end_time` IS NULL,TRUE,c.`cd_end_time`<![CDATA[>=]]>NOW())

                AND pc.`sp_key` = #{placeKey}

             LIMIT 1)c ON sp.`b_card_id` = c.`cd_id`

        WHERE sp.`b_state` = 0  
              AND IF(sp.b_start_time IS NULL,TRUE, sp.b_start_time<![CDATA[<=]]> NOW()) 
              AND IF(sp.b_end_time IS NULL,TRUE, sp.b_end_time <![CDATA[>=]]> NOW())

              <if test="platform == 1">

                  AND IF(p.`b_min_android_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> p.b_min_android_version_code,TRUE)

                  AND IF(sp.`b_min_android_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> sp.b_min_android_version_code,TRUE)

              </if>

              <if test="platform == 2">

                  AND IF(p.`b_min_ios_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> p.b_min_ios_version_code,TRUE)

                  AND IF(sp.`b_min_ios_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> sp.b_min_ios_version_code,TRUE)

              </if>

        ORDER BY p.`b_orderby`

        ORDER BY sp.`b_orderby`

        LIMIT ${start},${count}

    </select>



@@ -362,6 +371,13 @@
        WHERE sp.`b_state` = 0  

            AND IF(sp.b_start_time IS NULL,TRUE, sp.b_start_time<![CDATA[<=]]> NOW()) 

              AND IF(sp.b_end_time IS NULL,TRUE, sp.b_end_time <![CDATA[>=]]> NOW())

              <if test="platform == 1">

              AND IF(sp.`b_min_android_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> sp.b_min_android_version_code,TRUE)

            </if>

            <if test="platform == 2">

              AND IF(sp.`b_min_ios_version_code` IS NOT NULL, #{versionCode}<![CDATA[>=]]> sp.b_min_ios_version_code,TRUE)

            </if>

			  
        <include refid="Sex_Screen" />

    </select>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/SpecialServiceImpl.java

@@ -30,6 +30,7 @@
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;

import com.yeshi.fanli.service.inter.homemodule.SpecialPlaceService;

import com.yeshi.fanli.service.inter.homemodule.SpecialService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;



@@ -458,7 +459,10 @@
        else if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))

            indexArc = "index_arc_1.5.6";



        List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex);

        int platformCode = Constant.getPlatformCode(acceptData.getPlatform());

        int version = Integer.parseInt(acceptData.getVersion());

		
        List<Special> listArc = specialMapper.listByPlaceKey(indexArc, sex, platformCode, version);

        if (listArc == null) {

            listArc = new ArrayList<Special>();

        } else if (listArc.size() > 0) {

@@ -506,7 +510,7 @@
                && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            // 如果IOS当前版本处于审核状态就不返回

        } else {

            listActivity = specialMapper.listByPlaceKey("index_activity", null);

            listActivity = specialMapper.listByPlaceKey("index_activity", null, platformCode, version);

        }



        if (listActivity == null) {

@@ -529,7 +533,7 @@
            indexBlock = "index_block_1.5.6";



        JSONObject blockJsonMap = new JSONObject();

        List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex);

        List<Special> listBlock = specialMapper.listByPlaceKey(indexBlock, sex, platformCode, version);

        if (listBlock == null) {

            listBlock = new ArrayList<Special>();

        } else if (listBlock.size() > 0) {

@@ -563,8 +567,8 @@
    }



    @Override

    public List<Special> listByPlaceKey(String placeKey) {

        return specialMapper.listByPlaceKey(placeKey, null);

    public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode) {

        return specialMapper.listByPlaceKey(placeKey, null, platform, versionCode);

    }



    /**


 fanli/src/main/java/com/yeshi/fanli/service/inter/homemodule/SpecialService.java

@@ -94,7 +94,7 @@
     * @param placeKey

     * @return

     */

    public List<Special> listByPlaceKey(String placeKey);

    public List<Special> listByPlaceKey(String placeKey, Integer platform, Integer versionCode);





    /**