修改相关bug

admin

2021-01-15 5405154d6979f1b50ce2d881bb164b1acca80b6d

 service-daylucky/src/main/java/com/ks/daylucky/util/factory/vo/ActivityDetailVOFactory.java

@@ -41,8 +41,8 @@
        vo.setHelpLink(helpLink);
        vo.setAssistCount(assistCount);
        vo.setSponsorActivityCount(sponsorActivityCount <= 1 ? 0 : sponsorActivityCount - 1);
        if (dto.getActivity().getActualOpenTime() != null) {
            vo.setActualOpenDate(TimeUtil.getGernalTime(dto.getActivity().getActualOpenTime().getTime(), "yyyy.MM.dd HH:mm"));
        if (dto.getActivity().getOpenInfo().getActualOpenTime() != null) {
            vo.setActualOpenDate(TimeUtil.getGernalTime(dto.getActivity().getOpenInfo().getActualOpenTime().getTime(), "yyyy.MM.dd HH:mm"));
        }

        return vo;
@@ -65,9 +65,12 @@
        bean.setId(activity.getId());
        //设置了预计结束时间
        if (activity.getPreFinishTime() != null) {
            long leftTime = activity.getPreFinishTime().getTime() - System.currentTimeMillis();
            if (leftTime < 0) {
                leftTime = 0L;
            long leftTime = 0;
            if (activity.getState() == LuckyActivity.STATE_STARTED) {
                leftTime = activity.getPreFinishTime().getTime() - System.currentTimeMillis();
                if (leftTime < 0) {
                    leftTime = 0L;
                }
            }
            bean.setLeftTime(leftTime);
        }
@@ -83,7 +86,7 @@
        }
        bean.setSponsor(ActivityListItemInfoVOFactory.create(activity.getSponsorInfo().getSponsors()));
        bean.setSponsorAd(create(activity.getSponsorInfo()));
        bean.setDateNumber("活动期号：" + ActivityUtil.getActivityDateNumber(activity.getId()));
        bean.setDateNumber("活动期号：" + ActivityUtil.getActivityDateNumber(activity.getId(), activity.getCreateTime()));
        return bean;
    }

@@ -102,7 +105,7 @@

            bean.setConditions(conditions);
            bean.setConditionsDesc(descList);
            bean.setMarks("注：系统将会由\"支付宝首页-服务提醒\"给用户下发是否中奖提醒消息提醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒消息提醒醒消息提醒醒");
            bean.setMarks(sponsorInfo.getAd().getDesc());
        }

        return bean;
@@ -117,7 +120,7 @@
        }
        conditions.add(String.format("参与者到达%s人自动开奖", openInfo.getMinPersonCount()));
        bean.setConditions(conditions);
        bean.setMarks("注：系统将会由\"支付宝首页-服务提醒\"给用户下发是否中奖提醒消息提醒消息提醒消息提醒消息提醒消息提醒消息提醒醒消息提醒醒...\n");
        bean.setMarks(openInfo.getRemarks());
        return bean;
    }