Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git into dev

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

@@ -112,7 +112,7 @@ public class UserTicketController extends BaseApiController {
   @PostMapping("/ticket/queryLuckyNum")
   @ApiOperation(value = "查看盲票幸运数字" , notes = "根据盲票组ID，获取盲票幸运数字")
   public AjaxResult queryLuckyNum(@RequestBody TicketParam param) {
-    Long userId = SecurityUtils.getLoginUser().getUserId();
+
     if (StringUtils.isBlank(param.getSerialNo())) {
       return AjaxResult.error("参数异常，盲票序列号缺失");
     }
@@ -127,12 +127,13 @@ public class UserTicketController extends BaseApiController {
     }
 
     // 已付款的盲票，需要校验当前用户是否有权限查看
-    if (ticket.getStatus() == TicketStatusEnum.ACTIVATED) {
+    /*if (ticket.getStatus() == TicketStatusEnum.ACTIVATED) {
+      Long userId = SecurityUtils.getLoginUser().getUserId();
       UserTicketOrderItem orderItem = userTicketOrderItemService.queryFinishedOrderItem(userId, ticket.getTicketId());
       if (null == orderItem) {
         return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1018);
       }
-    }
+    }*/
 
     TicketBox ticketBox = ticketBoxService.getById(ticket.getBoxId());
 
@@ -147,6 +148,7 @@ public class UserTicketController extends BaseApiController {
     ticketVO.setSalePrice(ticketBox.getSalePrice());
     ticketVO.setPlainLuckyNum(ticket.getPlainLuckyNum());
     ticketVO.setStatus(ticket.getStatus().getValue());
+    ticketVO.setPicUrl(ticketBox.getPicUrl());
 
     return AjaxResult.success(ticketVO);
   }

mp-admin/src/main/resources/application-8100.yml

@@ -120,4 +120,4 @@ miniprogram:
 
 # 盲票导出每页查询数量
 export:
-  page-size: 2000
+  page-size: 1000

mp-admin/src/main/resources/application-8200.yml

@@ -120,4 +120,4 @@ miniprogram:
 
 # 盲票导出每页查询数量
 export:
-  page-size: 2000
+  page-size: 1000

mp-admin/src/main/resources/application-dev.yml

@@ -121,5 +121,5 @@ miniprogram:
 
 # 盲票导出每页查询数量
 export:
-    page-size: 2000
+    page-size: 200
 

mp-admin/src/main/resources/application-test.yml

@@ -127,4 +127,4 @@ miniprogram:
 
 # 盲票导出每页查询数量
 export:
-  page-size: 500
+  page-size: 200

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

@@ -110,7 +110,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/user/wxauth/mobile",
                     "/api/v1/mp/channel/invite/register",
                     "/api/v1/mp/wx/urlschema/generate",
-                    "/api/v1/mp/wx/code/generate").anonymous()
+                    "/api/v1/mp/wx/code/generate",
+                    "/api/v1/mp/user/ticket/queryLuckyNum").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketVO.java

@@ -24,6 +24,11 @@ public class TicketVO {
    */
   private String boxId;
 
+  /**
+   * 图片
+   */
+  private String picUrl;
+
   /**
    * 标题
    */