Commit 9303164da263bf403b55af520d21aa948e85ed91
Merge branch 'test' into dev
Showing
1 changed file
with
3 additions
and
2 deletions
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
| @@ -105,12 +105,13 @@ public class LiveControllerApi { | @@ -105,12 +105,13 @@ public class LiveControllerApi { | ||
| 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 | + | ||
| 109 | + ShyLive shyLive = listshyLive.get(0); | ||
| 108 | //拒绝状态等于4 | 110 | //拒绝状态等于4 |
| 109 | if (activityStatus == 4) { | 111 | if (activityStatus == 4) { |
| 110 | //领取状态改为未领 | 112 | //领取状态改为未领 |
| 111 | - shylive1.setShenhe_state(CommonConst.RECEIVE_BEFORE); | 113 | + shyLive.setShenhe_state(CommonConst.RECEIVE_BEFORE); |
| 112 | } | 114 | } |
| 113 | - ShyLive shyLive = listshyLive.get(0); | ||
| 114 | //封装数据入库 | 115 | //封装数据入库 |
| 115 | //设置spid | 116 | //设置spid |
| 116 | shyLive.setSp_id(spId); | 117 | shyLive.setSp_id(spId); |