Преглед изворни кода

[BUG][修改][C端我的活动下当活动结束时间小于当前时间属于过期应该改变活动状态进入已过期下]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
c915163c12
4 измењених фајлова са 18 додато и 6 уклоњено
  1. +3
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  3. +11
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml

+ 3
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java Прегледај датотеку

@@ -125,8 +125,9 @@ public class ActivitySchedule {
} }
} }
//更新报名状态 //更新报名状态
wxActivityJoinMapper.updateStatus(activityList);

if (!activityList.isEmpty()) {
wxActivityJoinMapper.updateStatus(activityList);
}
} }


} }

+ 3
- 1
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Прегледај датотеку

@@ -436,7 +436,9 @@ public enum ErrorCode{
ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"), ACTIVITY_PERSON_LIMITED(30000, "活动报名人数超过限制"),
ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"), ACTIVITY_JOIN_NOT_FOUND(30001, "对不起,您未报名参加该活动"),
ACTIVITY_JOINED(30002, "您已报名该活动"), ACTIVITY_JOINED(30002, "您已报名该活动"),
ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束")
ACTIVITY_JOIN_TIME_END(30003, "活动报名时间已结束"),
ACTIVITY_SEND_ERROR(30004, "活动投放到宣传页失败,宣传页显示已达七条上限!"),
ACTIVITY_TIME_ERROR(30005, "活动报名结束时间不能大于活动结束时间"),
; ;


private int code; private int code;


+ 11
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxActivityServiceImpl.java Прегледај датотеку

@@ -94,6 +94,9 @@ public class WxActivityServiceImpl implements WxActivityService {
if (wxActivity.getEndTime().before(new Date())) { if (wxActivity.getEndTime().before(new Date())) {
throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END); throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END);
} }
if (wxActivity.getEndTime().after(wxActivity.getActivityEndTime())) {
throw new MallinkException(ErrorCode.ACTIVITY_TIME_ERROR);
}
Date date = new Date(); Date date = new Date();
wxActivity.setCreateTime(date); wxActivity.setCreateTime(date);
wxActivity.setUpdateTime(date); wxActivity.setUpdateTime(date);
@@ -153,16 +156,22 @@ public class WxActivityServiceImpl implements WxActivityService {


@Override @Override
public ResultData sendToCampaign(Long id) { public ResultData sendToCampaign(Long id) {
WxCampaign campaignQuery = new WxCampaign();
campaignQuery.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
int count = wxCampaignMapper.selectCount(campaignQuery);
if (count == 7) {
throw new MallinkException(ErrorCode.ACTIVITY_SEND_ERROR);
}
//修改投放状态 //修改投放状态
WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id); WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(id);
if (wxActivity.getEndTime().before(new Date())) { if (wxActivity.getEndTime().before(new Date())) {
return new ResultData(ErrorCode.ACTIVITY_JOIN_TIME_END);
throw new MallinkException(ErrorCode.ACTIVITY_JOIN_TIME_END);
} }
wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode()); wxActivity.setStatus(EnumActivityStatus.INJECT_CAMPAIGN.getCode());
wxActivity.setUpdateTime(new Date()); wxActivity.setUpdateTime(new Date());
wxActivityMapper.updateByPrimaryKeySelective(wxActivity); wxActivityMapper.updateByPrimaryKeySelective(wxActivity);
//添加到宣传页 //添加到宣传页
WxCampaign campaignQuery = new WxCampaign();
campaignQuery = new WxCampaign();
campaignQuery.setProduceId(id); campaignQuery.setProduceId(id);
WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery); WxCampaign campaign = wxCampaignMapper.selectOne(campaignQuery);
if (campaign == null) { if (campaign == null) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml Прегледај датотеку

@@ -100,7 +100,7 @@
<update id="updateStatus" parameterType="java.util.List"> <update id="updateStatus" parameterType="java.util.List">
update wx_activity_join set status = 3 where activity_id in update wx_activity_join set status = 3 where activity_id in
<foreach collection="activityList" index="index" item="activity" open="(" separator="," close=")">
<foreach collection="list" index="index" item="activity" open="(" separator="," close=")">
#{activity.id} #{activity.id}
</foreach> </foreach>
</update> </update>


Loading…
Откажи
Сачувај