Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!352

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketController.java

@@ -26,6 +26,7 @@ import com.qs.mp.common.enums.TicketPkgStatusEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
+import com.qs.mp.framework.security.handle.HostHolder;
 import com.qs.mp.user.domain.UserHitPrize;
 import com.qs.mp.user.domain.UserTicketOrderItem;
 import com.qs.mp.user.domain.vo.TicketHitPrizeBarrageVO;
@@ -75,6 +76,10 @@ public class UserTicketController extends BaseApiController {
   @Autowired
   private MapperFacade mapperFacade;
 
+
+  @Autowired
+  private HostHolder hostHolder;
+
   /**
    * 盲票进货列表
    */
@@ -241,14 +246,18 @@ public class UserTicketController extends BaseApiController {
   public AjaxResult hitPrizeBarrage() {
 
     // 获取用户 id
-    Long userId = SecurityUtils.getLoginUser().getUserId();
+    Long userId = 0L;
+
+    if (hostHolder.getUser() != null) {
+      userId = SecurityUtils.getLoginUser().getUserId();
+    }
 
     // 弹幕列表
     List<TicketHitPrizeBarrageVO> listOne = new ArrayList<>();
     List<TicketHitPrizeBarrageVO> listTwo = new ArrayList<>();
 
     // 获取用户当天中奖的 2 条弹幕
-    if (userId != null) {
+    if (userId != 0L) {
       List<TicketHitPrizeBarrageVO> ticketHitPrizeBarrageVOList = userHitPrizeService.hitPrizeBarrageByUserId(userId);
       if (CollectionUtils.isNotEmpty(ticketHitPrizeBarrageVOList)) {
         for (int i = 0; i < ticketHitPrizeBarrageVOList.size(); i++) {

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -112,6 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/wx/urlschema/generate",
                     "/api/v1/mp/wx/code/generate",
                     "/api/v1/mp/user/ticket/queryLuckyNum",
+                    "/api/v1/mp/user/ticket/hitPrizeBarrage",
                     "/api/v1/mp/user/mall/ticket/detail",
                     "/api/v1/mp/user/mall/ticket/list",
                     "/api/v1/mp/user/exchange/goods/list",