分页

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -30,6 +30,7 @@ import com.qs.mp.channel.service.IChannelOrderItemService;
 import com.qs.mp.channel.service.IChannelOrderService;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.common.core.domain.AjaxResult;
+import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.ChannelCertifyStatusEnum;
@@ -95,7 +96,7 @@ public class ChannelOrderController extends BaseApiController {
    */
   @PostMapping("/order/list")
   @ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
-  public AjaxResult list(@RequestBody ChannelOrder param) {
+  public TableDataInfo list(@RequestBody ChannelOrder param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     startPage();
     List<ChannelOrder> channelOrders = channelOrderService.list(
@@ -107,7 +108,7 @@ public class ChannelOrderController extends BaseApiController {
       channelOrderVO.setItems(channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
           .eq(ChannelOrderItem::getOrderId, channelOrderVO.getOrderId())));
     }
-    return AjaxResult.success(channelOrderVOList);
+    return getDataTable(channelOrderVOList);
   }
 
   /**

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -21,6 +21,7 @@ import com.qs.mp.admin.domain.vo.TicketBoxVO;
 import com.qs.mp.admin.service.ITicketAwardsPrizeService;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.common.core.domain.AjaxResult;
+import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
@@ -57,7 +58,7 @@ public class ChannelTicketController extends BaseApiController {
    */
   @PostMapping("/ticket/list")
   @ApiOperation(value = "盲票组列表" , notes = "获取所有盲票信息")
-  public AjaxResult list(@RequestBody TicketBoxParam param) {
+  public TableDataInfo list(@RequestBody TicketBoxParam param) {
     // TODO 根据标签过滤
     startPage();
     List<TicketBox> ticketBoxes = ticketBoxService.list(
@@ -65,7 +66,7 @@ public class ChannelTicketController extends BaseApiController {
             .eq(null != param.getCategoryId() && 0 != param.getCategoryId(), TicketBox::getCategoryId, param.getCategoryId())
             .eq(TicketBox::getStatus, TicketBoxStatusEnum.PUT_ON));
     List<TicketBoxListVO> ticketBoxListVOList = mapperFacade.mapAsList(ticketBoxes, TicketBoxListVO.class);
-    return AjaxResult.success(ticketBoxListVOList);
+    return getDataTable(ticketBoxListVOList);
   }
 
 

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

@@ -0,0 +1,43 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONType;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.qs.mp.common.json.EnumValueDeserializer;
+
+/**
+ *
+ * 盲票状态
+ *
+ */
+@JSONType(deserializer = EnumValueDeserializer.class)
+public enum TicketStatusEnum implements IEnum<Integer> {
+  NOT_PAY(1, "未付款"),
+  ACTIVATED(2, "已激活"),
+  CASHED(3, "已兑奖");
+
+  private final int value;
+  private final String desc;
+
+  TicketStatusEnum(final int value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public Integer getValue() {
+    return value;
+  }
+
+  /**
+   * 重写toString，单个转化成json
+   * @return
+   */
+  @Override
+  public String toString() {
+    JSONObject object = new JSONObject();
+    object.put("value",value);
+    object.put("desc", desc);
+    return object.toString();
+  }
+}

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

@@ -182,7 +182,7 @@ public class Ticket implements Serializable {
   private Integer isPhysical;
 
   /**
-   * 盲票状态（初始、已激活、已开奖、已兑奖）
+   * 盲票状态（初始、已激活、已兑奖）
    */
   @TableField("status")
   private String status;

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

@@ -0,0 +1,52 @@
+package com.qs.mp.admin.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qs.mp.admin.domain.TicketBox;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/7
+ */
+@Data
+public class TicketVO {
+  // 奖品列表
+  List<TicketAwardsPrizeVO> prizeList;
+
+  /**
+   * 盲票ID
+   */
+  private String ticketId;
+
+  /**
+   * 盲票组ID
+   */
+  private String boxId;
+
+  /**
+   * 标题
+   */
+  private String title;
+
+  /**
+   * 序列号
+   */
+  private String serialNo;
+
+  /**
+   * 面值
+   */
+  private Integer facePrice;
+
+  /**
+   * 明文幸运数字
+   */
+  private Integer plainLuckyNum;
+
+  /**
+   * 盲票状态（初始、已激活、已兑奖）
+   */
+  private String status;
+
+}