Merge branch 'dev'

王言钊
2 parents 41e86e74 9303164d
Showing 1 changed file with 8 additions and 1 deletions
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
@@ -103,9 +103,15 @@ public class LiveControllerApi {
         shylive1.setActivity_id(activityId);
         //查询一下 存在，更新 没有，插入
         List<ShyLive> listshyLive = liveService.findshyLive(shylive1);
-
+        //更新
         if (listshyLive.size() > 0) {
+
             ShyLive shyLive = listshyLive.get(0);
+            //拒绝状态等于4
+            if (activityStatus == 4) {
+                //领取状态改为未领
+                shyLive.setShenhe_state(CommonConst.RECEIVE_BEFORE);
+            }
             //封装数据入库
             //设置spid
             shyLive.setSp_id(spId);
@@ -178,6 +184,7 @@ public class LiveControllerApi {
             shyLive.setUpdated_at(CommonUtils.getCurrentTime());
  
             yorN = liveService.updateshyLive(shyLive);
+        //    插入
         } else {
             //查了，没有，直接插入数据库
             //设置直播活动id