elink-star
/
epdc-cloud-heart-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

爱心互助修改-heart模块

feature/yujt_comm_edu
zhangyuan 5 years ago
parent
a53ecd0736
commit
b480ccf259
4 changed files with 45 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
  2. 10
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
  3. 22
      epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
  4. 33
      epdc-cloud-heart/src/main/resources/mapper/activity/ActUserRelationDao.xml

4
epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
View File

@ -385,6 +385,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
if (ActUserRelationStatusConstant.SIGN_UP.equals(actUserStatus) || ActUserRelationStatusConstant.APPROVED.equals(actUserStatus)) {
return ActUserStatusConstant.CANCEL_SIGN_UP;
}
// (为报名活动或者已取消报名的)底部显示按钮 已报满
if(NumConstant.ONE == actInfoEntity.getActQuotaCategory() && actInfoEntity.getSignupNum() >= actInfoEntity.getActQuota()){
return ActUserStatusConstant.FULL_SIGN_UP;
}
// （报名审核未通过或者已经取消报名的）可再次报名-我要报名
if (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserStatus) || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserStatus)) {
return ActUserStatusConstant.SIGN_UP;

10
epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java
View File

@ -48,6 +48,7 @@ import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
import com.elink.esua.epdc.modules.activity.dao.ActInfoDao;
import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao;
import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity;
import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity;
import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity;
import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity;
@ -119,8 +120,6 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
@Override
public ActInfoClockResultDTO getActDetail(String id) {
ActInfoClockResultDTO resultDTO = baseDao.getActDetail(id);
resultDTO.setOldStatus(resultDTO.getStatus());
System.out.println(resultDTO);
return resultDTO;
}
@ -478,6 +477,13 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
// 给用户发送消息通知
this.sendNotice(actUserRelationDTO, actUserDefaultState, actInfoDTO);
}
// 审核不通过，活动的报名人数减少
if (!NumConstant.ONE_STR.equals(actUserDefaultState)) {
ActInfoEntity actInfoEntity = new ActInfoEntity();
actInfoEntity.setId(actInfoDTO.getId());
actInfoEntity.setSignupNum(actInfoDTO.getSignupNum() - data.size());
actInfoService.updateById(actInfoEntity);
}
} else {
return new Result().ok("该活动暂时没有未审核的志愿者");
}

22
epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
View File

@ -32,6 +32,7 @@ import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity;
import com.elink.esua.epdc.modules.phrases.redis.ActPhraseRedis;
import com.elink.esua.epdc.modules.phrases.service.ActPhraseService;
import com.elink.esua.epdc.phrases.ActPhraseDTO;
import io.netty.util.internal.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -120,7 +121,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
String key = RedisKeys.getPhraseListKey();
List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
if (null != list && list.size() > 0) {
redisUtils.set(key, list,RedisUtils.NOT_EXPIRE);
redisUtils.set(key, list, RedisUtils.NOT_EXPIRE);
}
}
}
@ -128,6 +129,17 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ActPhraseDTO dto) {
ActPhraseEntity act = baseDao.selectById(dto.getId());
// 判断本次修改是否修改了编码
String categoryCode = dto.getCode();
// 如果本次修改了唯一项编码，则判断输入的编码是否重复
if (!(act.getCode().equals(categoryCode))) {
if (StringUtils.isNotBlank(categoryCode)) {
if (getCodeCount(dto) > 0) {
throw new RenException("您输入的编码已存在");
}
}
}
ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class);
updateById(entity);
@ -135,7 +147,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
String key = RedisKeys.getPhraseListKey();
redisUtils.delete(key);
List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
redisUtils.set(key, list,RedisUtils.NOT_EXPIRE);
redisUtils.set(key, list, RedisUtils.NOT_EXPIRE);
}
@ -149,7 +161,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
String key = RedisKeys.getPhraseListKey();
redisUtils.delete(key);
List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
redisUtils.set(key, list,RedisUtils.NOT_EXPIRE);
redisUtils.set(key, list, RedisUtils.NOT_EXPIRE);
}
/**
@ -179,7 +191,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
String key = RedisKeys.getPhraseListKey();
redisUtils.delete(key);
List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
redisUtils.set(key, list,RedisUtils.NOT_EXPIRE);
redisUtils.set(key, list, RedisUtils.NOT_EXPIRE);
}
/**
@ -206,7 +218,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
list = (List<ActPhraseRedisEntity>) object;
} else {
list = baseDao.selectListPhraseInOrder();
redisUtils.set(key, list,RedisUtils.NOT_EXPIRE);
redisUtils.set(key, list, RedisUtils.NOT_EXPIRE);
}
return list;
}

33
epdc-cloud-heart/src/main/resources/mapper/activity/ActUserRelationDao.xml
View File

@ -94,11 +94,11 @@
<if test="status != null and status != ''">
AND relation.STATUS = #{status}
</if>
<if test="mobile != null and mobile != ''">
AND relation.MOBILE = #{mobile}
<if test="mobile != null and mobile.trim() != ''">
AND relation.MOBILE = trim(#{mobile})
</if>
<if test="realName != null and realName != ''">
AND relation.REAL_NAME = #{realName}
<if test="realName != null and realName.trim() != ''">
AND relation.REAL_NAME = trim(#{realName})
</if>
<if test="actId != null and actId != ''">
AND relation.ACT_ID = #{actId}
@ -170,11 +170,11 @@
<if test="status != null and status != ''">
AND relation.STATUS = #{status}
</if>
<if test="mobile != null and mobile != ''">
AND relation.MOBILE = #{mobile}
<if test="mobile != null and mobile.trim() != ''">
AND relation.MOBILE = trim(#{mobile})
</if>
<if test="realName != null and realName != ''">
AND relation.REAL_NAME = #{realName}
<if test="realName != null and realName.trim() != ''">
AND relation.REAL_NAME = trim(#{realName})
</if>
<if test="actId != null and actId != ''">
AND relation.ACT_ID = #{actId}
@ -193,16 +193,15 @@
<result property="radius" column="CLOCK_RADIUS"/>
</resultMap>
<select id="getActDetail" resultMap="actInfoClockResultMap">
<select id="getActDetail" resultType="com.elink.esua.epdc.activity.result.ActInfoClockResultDTO">
SELECT
relation.ID,
relation.ACT_ID,
relation.STATUS,
relation.FAILURE_REASON,
info.SIGNIN_ADDRESS,
info.SIGNIN_LATITUDE,
info.SIGNIN_LONGITUDE,
info.CLOCK_RADIUS
relation.ID id,
relation.ACT_ID actId,
relation.STATUS oldStatus,
info.SIGNIN_ADDRESS address,
info.SIGNIN_LATITUDE latitude,
info.SIGNIN_LONGITUDE longitude,
info.CLOCK_RADIUS radius
FROM
epdc_act_user_relation relation
LEFT JOIN

Write Preview
Loading…
Cancel
Save