活动bug修改

101captain

2022-03-11 898ae715bf17c0ea1afa6a5c98aa447d58c2515c

活动bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActSignDO.java

@@ -58,4 +58,6 @@
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String reason;

    private Integer times;
}

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

@@ -473,6 +473,9 @@
        if (isNull(actActivityDO)) {
            return R.fail("活动不存在");
        }
        if(actActivityDO.getSignUpBegin().after(new Date())){
            return R.fail("未到报名时间");
        }
        int num = 0;
        ComActActSignDO comActActSignDO = comActActSignDAO.selectOne(new QueryWrapper<ComActActSignDO>()
                .lambda().eq(ComActActSignDO::getActivityId, activityId).eq(ComActActSignDO::getUserId, userId));
@@ -546,12 +549,14 @@
                comActActSignDO.setCreateAt(new Date());
                comActActSignDO.setReason(null);
                comActActSignDO.setIsVolunteer(isVolunteer);
                comActActSignDO.setTimes(comActActSignDO.getTimes()+1);
                num = comActActSignDAO.updateById(comActActSignDO);
            } else {
                comActActSignDO = new ComActActSignDO();
                comActActSignDO.setActivityId(activityId);
                comActActSignDO.setUserId(userId);
                comActActSignDO.setIsVolunteer(isVolunteer);
                comActActSignDO.setTimes(1);
                num = comActActSignDAO.insert(comActActSignDO);
            }
        } else {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActSignMapper.xml

@@ -80,7 +80,7 @@
    <select id="listActivitySign" resultType="com.panzhihua.common.model.vos.community.ActivitySignVO">
        SELECT u.user_id id, u.image_url, u.name, u.nick_name,
            CASE WHEN a.is_volunteer = 1 THEN '志愿者' ELSE '居民' END identity,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , IF(r.times IS NULL, 0, r.times) AS times,
            u.phone, u.tags, a.create_at,  a.is_volunteer, a.status , a.times,
            a.reason, IF(r.times IS NULL, 0, r.award * r.times) AS award, t.limit
        FROM com_act_act_sign a
        JOIN sys_user u ON a.user_id = u.user_id