Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!673

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

@@ -95,6 +95,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), "t1.channel_id" ,queryParam.getChannelId());
     queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id" ,queryParam.getOrderId());
 	queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`" ,queryParam.getStatus());
+	queryWrapper.eq(null != queryParam && null != queryParam.getType(), "t1.`type`" ,queryParam.getType());
 	queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(),  "t1.created_time", queryParam.getStartTime());
 	queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 	queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t1.title", queryParam.getTitle());

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

@@ -0,0 +1,47 @@
+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;
+
+/**
+ * @author Cup
+ * @date 2022/6/6
+ */
+@JSONType(deserializer = EnumValueDeserializer.class)
+public enum ChannelOrderTypeEnum implements IEnum<Integer> {
+
+    RETAIL(1,"零售票"),
+    PRE(2,"预购票");
+
+    private final int value;
+    private final String desc;
+
+    ChannelOrderTypeEnum(int value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return this.value;
+    }
+
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * 重写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/TicketBox.java

@@ -146,6 +146,11 @@ public class TicketBox implements Serializable {
   @TableField("sale_price")
   private Integer salePrice;
 
+
+  @ApiModelProperty("预购价")
+  @TableField("pre_price")
+  private Integer prePrice;
+
   /**
    * 分佣的销售额百分比
    */
@@ -197,6 +202,10 @@ public class TicketBox implements Serializable {
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private TicketBoxStatusEnum status;
 
+  @ApiModelProperty("序列号加密:0否,1是")
+  @TableField("is_encrypt")
+  private Integer isEncrypt;
+
   /**
    * 逻辑删除标识
    */

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

@@ -10,6 +10,9 @@ import com.qs.mp.common.enums.TicketPkgSaleStatusEnum;
 import com.qs.mp.common.enums.TicketPkgStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -19,6 +22,7 @@ import lombok.Data;
  */
 @TableName("mp_ticket_package")
 @Data
+@ApiModel("盲票实体类")
 public class TicketPackage implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -26,36 +30,46 @@ public class TicketPackage implements Serializable {
   /**
    * 盲票包ID
    */
+  @ApiModelProperty("盲票包ID")
   @TableId(value = "pkg_id" , type = IdType.INPUT)
   private String pkgId;
 
   /**
    * 盲票组ID
    */
+  @ApiModelProperty("盲票组ID")
   @TableField("box_id")
   private String boxId;
 
   /**
    * 盲票包编号
    */
+  @ApiModelProperty("盲票包编号")
   @TableField("pkg_no")
   private String pkgNo;
 
   /**
    * 开始序号
    */
+  @ApiModelProperty("开始序号")
   @TableField("start_sn")
   private String startSn;
 
   /**
    * 结束序号
    */
+  @ApiModelProperty("结束序号")
   @TableField("end_sn")
   private String endSn;
 
+  @ApiModelProperty("是否预购票0否,1是")
+  @TableField("is_pre")
+  private Integer isPre;
+
   /**
    * 状态（待销售、已销售）
    */
+  @ApiModelProperty("状态（待销售、已销售）")
   @TableField("status")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private TicketPkgStatusEnum status;
@@ -63,6 +77,7 @@ public class TicketPackage implements Serializable {
   /**
    * 用户端销售状态（待售、销售中、已售罄）
    */
+  @ApiModelProperty("用户端销售状态（待售、销售中、已售罄）")
   @TableField("sale_status")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private TicketPkgSaleStatusEnum saleStatus;
@@ -70,24 +85,28 @@ public class TicketPackage implements Serializable {
   /**
    * 销售张数
    */
+  @ApiModelProperty("销售张数")
   @TableField("sale_qty")
   private Integer saleQty;
 
   /**
    * 每包张数
    */
+  @ApiModelProperty("每包张数")
   @TableField("pkg_unit")
   private Integer pkgUnit;
 
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   private Date updatedTime;
 

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

@@ -29,6 +29,9 @@ public class ChannelOrderQueryParam {
 
 	@ApiModelProperty(value = "订单状态", required = false)
 	private Integer status;
+
+	@ApiModelProperty("订单类型:1零售票,2预购票")
+	private Integer type;
 	
 	/**
 	 * 下单区间-开始时间

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

@@ -42,6 +42,10 @@ public class TicketBoxCreateParam {
 	@ApiModelProperty(value = "售价",required=true)
 	private Integer salePrice;
 
+	@NotNull(message = "预购价不能为空")
+	@ApiModelProperty(value = "预购价",required=true)
+	private Integer prePrice;
+
 	@NotNull(message = "数量不能为空")
 	@ApiModelProperty(value = "数量",required=true)
 	private Integer quantity;

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

@@ -28,6 +28,9 @@ public class TicketBoxUpdateParam {
     @ApiModelProperty(value = "图片")
     private String picUrl;
 
+    @ApiModelProperty(value = "预购价",required=true)
+    private Integer prePrice;
+
     @NotNull(message = "售价不能为空")
     @ApiModelProperty(value = "售价",required=true)
     private Integer salePrice;

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -112,6 +112,8 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     ticketBox.setTitle(param.getTitle());
     ticketBox.setPicUrl(param.getPicUrl());
     ticketBox.setSalePrice(param.getSalePrice());
+    // 设置预购价
+    ticketBox.setPkgSalePrice(param.getPrePrice());
     ticketBox.setPkgSalePrice(param.getPkgSalePrice());
     ticketBox.setOriginPrice(param.getOriginPrice());
     ticketBox.setSaleCommRate(param.getSaleCommRate());
@@ -307,6 +309,8 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     ticketBox.setStatus(TicketBoxStatusEnum.WAIT);
     ticketBox.setBoxNo(ticketBoxSerialService.generateSerial(ticketBox.getType()));
     ticketBox.setBoxId(bizIdGenerator.newId());
+    // 序列号加密
+    ticketBox.setIsEncrypt(1);
     ticketBox.setSaleChannelType(param.getSaleChannelType());
     save(ticketBox);
 

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrder.java

@@ -11,6 +11,7 @@ import com.qs.mp.common.enums.ChannelOrderStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.qs.mp.common.enums.ChannelOrderTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -76,6 +77,11 @@ public class ChannelOrder implements Serializable {
   @ApiModelProperty("实付金额")
   private Integer payAmt;
 
+  @ApiModelProperty("订单类型1零售票,2预购票")
+  @TableField("type")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+  private ChannelOrderTypeEnum type;
+
   /**
    * 订单状态，-1 已取消 0:待付款 1:待发货 2:待收货 3:已完成
    */