Commit 8fd496f3f131a7084f2bcc6c9ef4ffac613c22bc
Merge branch 'test' into dev
Showing
1 changed file
with
7 additions
and
1 deletions
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
| @@ -103,8 +103,13 @@ public class LiveControllerApi { | @@ -103,8 +103,13 @@ public class LiveControllerApi { | ||
| 103 | shylive1.setActivity_id(activityId); | 103 | shylive1.setActivity_id(activityId); |
| 104 | //查询一下 存在，更新 没有，插入 | 104 | //查询一下 存在，更新 没有，插入 |
| 105 | List<ShyLive> listshyLive = liveService.findshyLive(shylive1); | 105 | List<ShyLive> listshyLive = liveService.findshyLive(shylive1); |
| 106 | - | 106 | + //更新 |
| 107 | if (listshyLive.size() > 0) { | 107 | if (listshyLive.size() > 0) { |
| 108 | + //拒绝状态等于4 | ||
| 109 | + if (activityStatus == 4) { | ||
| 110 | + //领取状态改为未领 | ||
| 111 | + shylive1.setShenhe_state(CommonConst.RECEIVE_BEFORE); | ||
| 112 | + } | ||
| 108 | ShyLive shyLive = listshyLive.get(0); | 113 | ShyLive shyLive = listshyLive.get(0); |
| 109 | //封装数据入库 | 114 | //封装数据入库 |
| 110 | //设置spid | 115 | //设置spid |
| @@ -178,6 +183,7 @@ public class LiveControllerApi { | @@ -178,6 +183,7 @@ public class LiveControllerApi { | ||
| 178 | shyLive.setUpdated_at(CommonUtils.getCurrentTime()); | 183 | shyLive.setUpdated_at(CommonUtils.getCurrentTime()); |
| 179 | 184 | ||
| 180 | yorN = liveService.updateshyLive(shyLive); | 185 | yorN = liveService.updateshyLive(shyLive); |
| 186 | + // 插入 | ||
| 181 | } else { | 187 | } else { |
| 182 | //查了，没有，直接插入数据库 | 188 | //查了，没有，直接插入数据库 |
| 183 | //设置直播活动id | 189 | //设置直播活动id |