Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 a8ba074e4b0807cee707614a55e31e34ea0fbbde

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActActivityServiceImpl.java

@@ -56,9 +56,14 @@
            comActActivityDO.setPublishAt(now);//发布时间
        }
        //如果发布时间大于现在时间状态改为进行中
        if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
        /*if(now.getTime()<comActActivityVO.getBeginAt().getTime()){
            comActActivityDO.setStatus(3);
        }*/
        //结束时间大于当前时间则设置为“进行中”
        if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
            comActActivityDO.setStatus(4);
        }

        boolean save = this.save(comActActivityDO);
        if(!save){
            return R.fail();
@@ -78,6 +83,12 @@
    public R putActivity(ComActActivityVO comActActivityVO) {
        ComActActivityDO comActActivityDO=new ComActActivityDO();
        BeanUtils.copyProperties(comActActivityVO,comActActivityDO);

        //结束时间大于当前时间则设置为“进行中”
        Date now = new Date();
        if(comActActivityVO.getSignUpEnd()!=null && now.getTime()<comActActivityVO.getSignUpEnd().getTime()){
            comActActivityDO.setStatus(4);
        }
        boolean b = this.updateById(comActActivityDO);
        if (b) {
            return R.ok();