渠道经营数据

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

@@ -290,6 +290,7 @@ public class ChannelController extends BaseApiController {
 			channelId = jsonObject.getLong("channelId");
 		}
 		days = days > 0?days:1;
+		startPage();
 		List<Channel> list = channelService.list(
 		        new LambdaQueryWrapper<Channel>().eq(Channel::getParentId, channelId).gt(Channel::getLevel, 0)
 		            .orderByDesc(Channel::getChannelId));
@@ -308,7 +309,9 @@ public class ChannelController extends BaseApiController {
 				}
 			}
 		}
-		return getDataTable(dataList);
+		TableDataInfo resData = getDataTable(list);
+		resData.setRows(dataList);
+		return resData;
 	}
 
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserController.java → mp-admin/src/main/java/com/qs/mp/web/controller/api/common/UserController.java

@@ -1,4 +1,4 @@
-package com.qs.mp.web.controller.api.user;
+package com.qs.mp.web.controller.api.common;
 
 import cn.jsms.api.ValidSMSResult;
 import com.alibaba.fastjson.JSONArray;

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

@@ -14,7 +14,8 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 public enum TicketStatusEnum implements IEnum<Integer> {
   NOT_PAY(1, "未付款"),
   ACTIVATED(2, "已激活"),
-  CASHED(3, "已兑奖");
+  CASHED(3, "已兑奖"),
+  PAYING(4, "付款中"),; // 线上订单创建后，盲票状态变更为付款中，防止并发
 
   private final int value;
   private final String desc;

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

@@ -1,9 +1,12 @@
 package com.qs.mp.admin.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qs.mp.common.enums.TicketStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Data;
@@ -185,7 +188,8 @@ public class Ticket implements Serializable {
    * 盲票状态（初始、已激活、已兑奖）
    */
   @TableField("status")
-  private String status;
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+  private TicketStatusEnum status;
 
   /**
    * 创建时间

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

@@ -56,6 +56,12 @@ public class TicketBox implements Serializable {
   @TableField("description")
   private String description;
 
+  /**
+   * 卖点
+   */
+  @TableField("sale_point")
+  private String salePoint;
+
   /**
    * 盲票形式（线上或线下）
    */

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

@@ -0,0 +1,16 @@
+package com.qs.mp.admin.domain.param;
+
+import com.qs.mp.common.enums.TicketTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@ApiModel(value= "盲票参数")
+@Data
+public class TicketParam {
+
+	@ApiModelProperty(value = "盲票ID",required=false)
+	private String ticketId;
+
+}

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

@@ -9,6 +9,7 @@
         <result column="pic_url" property="picUrl" />
         <result column="category_id" property="categoryId" />
         <result column="description" property="description" />
+        <result column="sale_point" property="salePoint" />
         <result column="type" property="type" />
         <result column="quantity" property="quantity" />
         <result column="sale_qty" property="saleQty" />
@@ -32,7 +33,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        box_id, title, pic_url, category_id, description, type, quantity, sale_qty, pkg_price, pkg_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, on_time, off_time, manual_off, status, is_deleted, created_time, updated_time
+        box_id, title, pic_url, category_id, description, sale_point, type, quantity, sale_qty, pkg_price, pkg_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, on_time, off_time, manual_off, status, is_deleted, created_time, updated_time
     </sql>
 
 </mapper>