瀏覽代碼

上线、下线、推荐活动

zdm 6 年之前
父節點
當前提交
3572064988

+ 12 - 0
common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/ActivityDO.java

@ -84,6 +84,10 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
    private Long count;//报名人数
    @Column(name = "del_flag")
    private Integer delFlag;//1有效0无效
    /**
     * 通用模板code
     */
    private String globelTemplate;
    @Transient
@ -376,4 +380,12 @@ public class ActivityDO extends UuidIdentityEntityWithOperator implements Serial
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public String getGlobelTemplate() {
        return globelTemplate;
    }
    public void setGlobelTemplate(String globelTemplate) {
        this.globelTemplate = globelTemplate;
    }
}

+ 1 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@ -39,6 +39,7 @@ public class HealthBankMapping {
        public static final String createActivity="/createActivity";
        public static final String findActivity="/findActivity";
        public static final String updateActivity="/updateActivity";
        public static final String editActivity="/editActivity";
        public static final String batchActivity = "/batchActivity";
        public static final String createActivityInfo ="/createActivityInfo";
        public static final String findActivityInfo = "/findActivityInfo";

+ 25 - 0
svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@ -5,6 +5,7 @@ package com.yihu.jw.controller;/**
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.entity.health.bank.ActivityDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.service.ActivityService;
@ -170,6 +171,30 @@ public class ActivityController extends EnvelopRestEndpoint {
        }
    }
    /**
     * 编辑活动:上下线、推荐
     *
     * @param id
     * @param type
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.editActivity)
    @ApiOperation(value = "编辑活动:上下线、推荐")
    public ObjEnvelop<Boolean> editActivity(
            @ApiParam(name = "id", value = "活动id")
            @RequestParam(value = "id", required = true) String id,
            @ApiParam(name = "type", value = "操作类型:上线:0,下线:2,推荐:3")
            @RequestParam(value = "type", required = true) String type) {
        try {
            ActivityDO activityDO=service.editActivity(id, type);
            return  ObjEnvelop.getSuccess("操作成功!",activityDO);
        } catch (Exception e) {
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return ObjEnvelop.getError(e.getMessage());
        }
    }

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

@ -12,9 +12,12 @@ import com.yihu.jw.entity.health.bank.ActivityRuleDO;
import com.yihu.jw.entity.health.bank.TaskDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.util.ISqlUtils;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@ -23,6 +26,7 @@ import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -287,6 +291,56 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
        return envelop;
    }
    /**
     * 编辑活动:上、下线,推荐
     * @param id
     * @param type 操作类型:上线:0,下线:2,推荐:3
     * @return
     * @throws Exception
     */
    public ActivityDO editActivity(String id, String type) throws Exception {
        ActivityDO activityDO = activityDao.findOne(id);
        ActivityRuleDO activityRuleDO= activityRuleDao.selectByActivityId(id);
        if("3".equals(type)){
            //推荐
            activityDO.setRecommended(1);
        }else if("2".equals(type)){
            //下线
            activityDO.setStatus(2);
        }else if("1".equals(type)){
            //上线
            String ruleJson=null!=activityRuleDO?activityRuleDO.getValue2():"";
            JSONObject obj=JSONObject.parseObject(ruleJson);
            SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm");
            //报名截止时间
            Date registrationTime=null!=obj.get("registrationTime")? sdf.parse(obj.get("registrationTime").toString()):null;
            //参与截止时间
            Date deadLine=null!=obj.get("deadLine")? sdf.parse(obj.get("deadLine").toString()):null;
            //活动下线时间
            Date activityOfflineTime=null!=obj.get("activityOfflineTime")? sdf.parse(obj.get("activityOfflineTime").toString()):null;
            //获取当前时间
            Date now = DateUtil.strToDate(sdf.format(new Date()),"yyyy-MM-dd HH:mm");
            if(activityOfflineTime.compareTo(now)<=0){
                //活动下线
                activityDO.setStatus(2);
            }else if(activityOfflineTime.compareTo(now)>0 && deadLine.compareTo(now)<=0){
                //活动结束
                activityDO.setStatus(-1);
            }else if(deadLine.compareTo(now)>0&&registrationTime.compareTo(now)<=0){
                //活动未结束
                activityDO.setStatus(0);
            }else if (registrationTime.compareTo(now)>1){
                //报名未截止
                activityDO.setStatus(1);
            }
        }
        activityDO=  activityDao.save(activityDO);
        return activityDO;
    }
}