yujian
2019-09-10 9dfd71c4bde5afe4bf9bb9a8ec07549e4790b992
Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
2个文件已修改
27 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -721,21 +721,29 @@
     */
    @RequestMapping(value = "getSpecialChannelActivity")
    public void getSpecialChannelActivity(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
        long time = System.currentTimeMillis();
        List<Special> list = specialService.listByPlaceKey("special_channel_activity");
        // 删除尚未启用的过期的
        for (int i = 0; i < list.size(); i++) {
            Special special = list.get(i);
            if (special.getState() == 1L) {
                list.remove(i--);
            }else{
            } else {
                if (special.isTimeTask()) {
                    if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
                        list.remove(i--);
                    } else// 设置倒计时
                    {
                        special.setCountDownTime((special.getEndTime().getTime() - time) / 1000);
                    }
                }
            }
        }
        GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
        Gson gson = gsonBuilder.create();
        JSONObject data = new JSONObject();
        data.put("count", count);
        data.put("count", list.size());
        data.put("list", gson.toJson(list));
        if (!StringUtil.isNullOrEmpty(callback)) {
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -106,6 +106,7 @@
    @Column(name = "b_show_type")
    private String showType;
    @Expose
    // 备注
    @Column(name = "b_remark")
    private String remark;
@@ -150,11 +151,23 @@
    
    
    // 是否定时
    @Expose
    private boolean timeTask;
    // 起始时间
    private String startTime_str;
    // 结束时间
    private String endTime_str;
    @Expose
    private long countDownTime;//倒计时
    public long getCountDownTime() {
        return countDownTime;
    }
    public void setCountDownTime(long countDownTime) {
        this.countDownTime = countDownTime;
    }
    public Long getId() {
        return id;