temp

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -202,7 +202,6 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        }
        activityDO.setUpdateTime(new Date());
        activityDO.setDelFlag(1);
        activityDO= activityDao.save(activityDO);
        //删除活动任务与奖品
        taskGoodsDao.deleteByActivityId(activityDO.getId());
        if (value3 !=null && value3 !=""){
@@ -229,16 +228,12 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        ActivityRuleDO activityRuleDO = activityRuleDao.selectByActivityId(activityDO.getId());
        activityRuleDO.setUpdateTime(new Date());
        activityRuleDO.setSaasId("dev");
//        if (1 == activityDO.getStatus()) {
//            activityDO.setReleaseTime(new Date());
//        }
        activityRuleDO.setValue1(value1);
        activityRuleDO.setValue2(value2);
        activityRuleDO.setValue3(value3);
        activityRuleDO.setDelFlag(1);
        activityRuleDO= activityRuleDao.save(activityRuleDO);
        activityRuleDao.save(activityRuleDO);
        activityDao.save(activityDO);
        activityDO.setActivityRuleDO(activityRuleDO);
        MixEnvelop<Boolean, Boolean> envelop = new MixEnvelop<>();
        envelop.setObj(true);
        return envelop;
@@ -453,14 +448,14 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
            if(null!=activityRuleDO){
                String ruleJson=activityRuleDO.getValue2();
                JSONObject obj=JSONObject.parseObject(ruleJson);
                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
//                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                //报名截止时间
                Date registrationTime=(null!=obj.get("registrationTime")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("registrationTime").toString())),"yyyy-MM-dd HH:mm"):null);
                Date registrationTime=(null!=obj.get("registrationTime")? sdf2.parse(obj.get("registrationTime").toString()):null);
                //参与截止时间
                Date deadLine=(null!=obj.get("deadLine")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("deadLine").toString())),"yyyy-MM-dd HH:mm"):null);
                Date deadLine=(null!=obj.get("deadLine")? sdf2.parse(obj.get("deadLine").toString()):null);
                //活动下线时间
                Date activityOfflineTime=(null!=obj.get("activityOfflineTime")? DateUtil.strToDate(sdf2.format(sdf1.parse(obj.get("activityOfflineTime").toString())),"yyyy-MM-dd HH:mm"):null);
                Date activityOfflineTime=(null!=obj.get("activityOfflineTime")? sdf2.parse(obj.get("activityOfflineTime").toString()):null);
                //获取当前时间
                Date now = DateUtil.strToDate(sdf2.format(new Date()),"yyyy-MM-dd HH:mm");
                if(null!=activityOfflineTime&&activityOfflineTime.compareTo(now)<=0){