Merge branch 'test' into dev

王言钊
2 parents 8fd496f3 b0c320d1
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 {
         List<ShyLive> listshyLive = liveService.findshyLive(shylive1);
         //更新
         if (listshyLive.size() > 0) {
+
+            ShyLive shyLive = listshyLive.get(0);
             //拒绝状态等于4
             if (activityStatus == 4) {
                 //领取状态改为未领
-                shylive1.setShenhe_state(CommonConst.RECEIVE_BEFORE);
+                shyLive.setShenhe_state(CommonConst.RECEIVE_BEFORE);
             }
-            ShyLive shyLive = listshyLive.get(0);
             //封装数据入库
             //设置spid
             shyLive.setSp_id(spId);