Merge branch 'mp-server-test' into dev

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

@@ -52,6 +52,7 @@ import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -391,6 +392,23 @@ public class UserTicketController extends BaseApiController {
     }
 
 
+    @PostMapping("/ticket/list/underChannel")
+    @ApiOperation("查询门店下盲票组列表")
+    @ApiResponses(
+            @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
+    )
+    public TableDataInfo listUnderChannel(@RequestBody TicketBoxQueryParam ticketBoxQueryParam) {
+        startPage();
+        QueryWrapper<TicketBox> ticketBoxQueryWrapper = new QueryWrapper<>();
+        ticketBoxQueryWrapper.eq("t1.status", TicketBoxStatusEnum.PUT_ON)
+                .eq("t1.sale_channel_type", TicketBoxSaleChannelTypeEnum.SHOP.getValue())
+                .eq("t2.channel_id", ticketBoxQueryParam.getChannelId());
+
+        List<TicketBox> ticketBoxList = ticketBoxService.listBySaleChannel(ticketBoxQueryWrapper);
+        return getDataTable(ticketBoxList);
+    }
+
+
     @PostMapping("/ticket/prize/list/{boxId}")
     @ApiOperation("查询盲票下奖品列表")
     public TableDataInfo listPrize(@PathVariable("boxId") String boxId) {