解决合并冲突

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

@@ -463,27 +463,6 @@ public class TicketBoxMgrController extends BaseApiController {
 
     }
 
-    /**
-     * 查询单个盲票组绑定的红包奖项或者查询盲票组全部的红包奖项记录
-     * @param jsonObject
-     * @return
-     */
-    @PostMapping(value = "/redEnvelopeAward")
-    @PreAuthorize("@ss.hasPermi('business:awards:query')")
-    @ApiOperation("查询单个盲票组绑定的红包奖项或者查询盲票组全部的红包奖项记录")
-    @com.github.xiaoymin.knife4j.annotations.DynamicParameters(properties = {
-        @DynamicParameter(name = "boxId", value = "盲票组id", required = true, dataTypeClass = Long.class)
-    })
-    @ApiResponses(
-        @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
-    )
-    public TableDataInfo redEnvelopeAward(@RequestBody JSONObject jsonObject) {
-        startPage();
-        String boxId = jsonObject.getString("boxId");
-        List<TicketAwardsPrizeVO> TicketAwardsPrizeVO = ticketAwardsPrizeService.listPrizeByBoxIdVO(boxId);
-        return getDataTable(TicketAwardsPrizeVO);
-    }
-
     /**
      * 线下盲票组停售
      * @param

mp-common/src/main/java/com/qs/mp/common/enums/ErrorCodeEnum.java

@@ -34,7 +34,7 @@ public enum ErrorCodeEnum {
     ERROR_CODE_1025(1025, "删除失败，标签下存在商品"),
 
     ERROR_CODE_1026(1026, "用户支付宝未授权登录"),
-    ;
+    ERROR_CODE_1027(1027, "盲票已停售");
     private int code;
     private String msg;
 

mp-common/src/main/java/com/qs/mp/common/enums/TicketBoxStatusEnum.java

@@ -18,7 +18,8 @@ public enum TicketBoxStatusEnum implements IEnum<String> {
   DOING("doing", "出票中"),
   DONE("done", "待上架"),
   PUT_ON("on", "已上架"),
-  PUT_OFF("off", "已下架");
+  PUT_OFF("off", "已下架"),
+  STOP("stop","已停售");
 
   private final String value;
   private final String desc;