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

Mp server test

See merge request quanshu/mp-server!356

mp-admin/src/main/java/com/qs/mp/handler/auth/SignInterceptor.java

@@ -1,6 +1,7 @@
 package com.qs.mp.handler.auth;
 
 import com.alibaba.fastjson.JSONObject;
+import com.qs.mp.common.enums.ServerEnvEnum;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.http.HttpHelper;
 import com.qs.mp.core.domain.LoginUser;
@@ -13,6 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
@@ -36,6 +38,11 @@ public class SignInterceptor implements HandlerInterceptor {
     @Autowired
     private HostHolder hostHolder;
 
+    @Value(value = "${server.env}")
+    private String env;
+
+
+
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -43,6 +50,9 @@ public class SignInterceptor implements HandlerInterceptor {
         if (!(handler instanceof HandlerMethod)) {
             return true;
         }
+        if (ServerEnvEnum.DEV.getCode().equals(env)) {
+            return true;
+        }
         String method = request.getMethod();
         if ("post".equalsIgnoreCase(method)) {
             // 最后用RequestBody中获取token

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

@@ -47,6 +47,8 @@ import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.ws.rs.POST;
+
 
 @RestController
 @RequestMapping("/api/v1/mp/user")
@@ -241,7 +243,7 @@ public class UserTicketController extends BaseApiController {
     return AjaxResult.success();
   }
 
-  @GetMapping("/ticket/hitPrizeBarrage")
+  @PostMapping("/ticket/hitPrizeBarrage")
   @ApiOperation(value = "中奖弹幕", notes = "获取最近中奖的 20-22 条信息")
   public AjaxResult hitPrizeBarrage() {
 
@@ -249,7 +251,7 @@ public class UserTicketController extends BaseApiController {
     Long userId = 0L;
 
     if (hostHolder.getUser() != null) {
-      userId = SecurityUtils.getLoginUser().getUserId();
+      userId = hostHolder.getUser().getUserId();
     }
 
     // 弹幕列表

mp-service/src/main/resources/mapper/admin/TicketMapper.xml

@@ -46,7 +46,7 @@
     
     <select id="getTicketQtyCnt" resultType="integer">
        select
-		 SUM( CASE WHEN (t2.`status` = 1 and t3.type = 'offline') THEN 1 ELSE 0 END ) AS offLineQtyCnt
+		 IFNULL(SUM( CASE WHEN (t2.`status` = 1 and t3.type = 'offline') THEN 1 ELSE 0 END ),0)  AS offLineQtyCnt
 		from mp_channel_order_detail t1
 		left join mp_ticket t2 on t1.pkg_id = t2.pkg_id
 		left join mp_ticket_box t3 on t2.box_id = t3.box_id
@@ -56,7 +56,7 @@
      <select id="listTicketQtyCnt" resultType="com.qs.mp.admin.domain.vo.TicketCntVO">
        select
          t1.channel_id channelId,
-		 SUM( CASE WHEN (t2.`status` = 1 and t3.type = 'offline') THEN 1 ELSE 0 END ) AS offLineQtyCnt
+		SUM( CASE WHEN (t2.`status` = 1 and t3.type = 'offline') THEN 1 ELSE 0 END ) AS offLineQtyCnt
 		from mp_channel_order_detail t1
 		left join mp_ticket t2 on t1.pkg_id = t2.pkg_id
 		left join mp_ticket_box t3 on t2.box_id = t3.box_id