fix:bug

fs-common/src/main/java/com/fs/common/vo/LiveVo.java

@@ -43,4 +43,7 @@ public class LiveVo {
     private Long nowDuration;
     private BigDecimal nowPri;
     private Long storeId;
+
+    /** 上下架 */
+    private Integer isShow;
 }

fs-service-system/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java

@@ -152,12 +152,12 @@ public class LiveServiceImpl implements ILiveService
     public LiveVo asyncToCacheLiveDetail(Long id) {
         LocalDateTime now = LocalDateTime.now();
 		Live live = selectLiveByLiveId(id);
-		if(ObjectUtil.isEmpty( live) || Integer.valueOf(2).equals(live.getStatus())) {
+		if(ObjectUtil.isEmpty(live)) {
             return null;
         }
-		Long storeId = liveGoodsService.getStoreIdByLiveId(live.getLiveId());
+		// Long storeId = liveGoodsService.getStoreIdByLiveId(live.getLiveId());
 		LiveVo liveVo = new LiveVo();
-        liveVo.setStoreId(storeId);
+        // liveVo.setStoreId(storeId);
 		BeanUtils.copyProperties(live, liveVo);
 		liveVo.setNowDuration(200L);
 		if(live.getStatus() == 2){

fs-user-app/pom.xml

@@ -182,8 +182,17 @@
                     <dockerHost>http://8.140.143.122:2375</dockerHost>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
-
 </project>

fs-user-app/src/main/java/com/fs/app/controller/LiveController.java

@@ -2,6 +2,7 @@ package com.fs.app.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fs.app.annotation.Login;
+import com.fs.app.facade.LiveFacadeService;
 import com.fs.app.vo.LiveInfoVo;
 import com.fs.app.vo.LiveVo;
 import com.fs.app.websocket.bean.SendMsgVo;

fs-user-app/src/main/java/com/fs/app/facade/impl/LiveFacadeServiceImpl.java

@@ -117,11 +117,16 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
         LiveVo liveVo;
         if (ObjectUtil.isNotEmpty(o)) {
             liveVo = JSON.parseObject(o.toString(), LiveVo.class);
-
         } else {
             liveVo = liveService.asyncToCacheLiveDetail(id);
         }
-        return R.ok().put("data", liveVo).put("storeId", liveVo.getStoreId());
+        if (ObjectUtil.isEmpty(liveVo)) {
+            R.error("未找到直播");
+        }
+        if(liveVo.getIsShow() == 2) {
+            return R.error("直播未开放");
+        }
+        return R.ok().put("data", liveVo);
     }
 
     @Override
@@ -154,9 +159,9 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
     }
 
     @Override
-    @DistributeLock(keyExpression = "#lottery.liveId + #lottery.userId", scene = "draw_claim")
+    @DistributeLock(keyExpression = "#lottery.liveId +'_' #lottery.userId", scene = "draw_claim")
     public R drawClaim(LotteryPO lottery) {
-        Object o = redisUtil.hashGet(String.format(LiveKeysConstant.LIVE_HOME_PAGE_CONFIG_RED, lottery.getLiveId(), lottery.getLotteryId()), String.valueOf(lottery.getUserId()));
+        Object o = redisUtil.hashGet(String.format(LiveKeysConstant.LIVE_HOME_PAGE_CONFIG_DRAW, lottery.getLiveId(), lottery.getLotteryId()), String.valueOf(lottery.getUserId()));
         if (ObjectUtil.isNotEmpty(o)) {
             return R.ok("您已参加抽奖活动，请等待开奖！");
         }

fs-user-app/src/main/java/com/fs/app/vo/LiveVo.java

@@ -46,4 +46,5 @@ public class LiveVo {
     private Long nowDuration;
     private BigDecimal nowPri;
     private Long storeId;
+    private Integer isShow;
 }