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

预购票列表

See merge request quanshu/mp-server!674

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

@@ -71,6 +71,10 @@ public class ChannelTicketController extends BaseApiController {
       }
     }
     QueryWrapper<TicketBox> queryWrapper = new QueryWrapper<>();
+
+    if (Objects.nonNull(param.getIsPre()) && param.getIsPre() == 1) {
+      queryWrapper.gt("t1.pre_price", 0);
+    }
     queryWrapper.eq("t1.type",param.getType());
     if (Objects.nonNull(param.getCategoryId()) && param.getCategoryId() != 0) {
       queryWrapper.eq("t1.category_id",param.getCategoryId());

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

@@ -20,6 +20,9 @@ public class TicketBoxParam {
 	@ApiModelProperty(value = "标签ID",required=false)
 	private Long tagId;
 
+	@ApiModelProperty("是否预购票:0否,1是")
+	private Integer isPre;
+
 	@NotNull(message = "盲票类型不能为空")
 	@ApiModelProperty(value = "盲票类型",required=true)
 	private TicketTypeEnum type;

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

@@ -90,6 +90,9 @@ public class TicketBoxListVO {
   @ApiModelProperty("盲票销售价格")
   private Integer salePrice;
 
+  @ApiModelProperty("盲票预购价")
+  private Integer prePrice;
+
   /**
    * 分佣的销售额百分比
    */

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

@@ -113,7 +113,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
     ticketBox.setPicUrl(param.getPicUrl());
     ticketBox.setSalePrice(param.getSalePrice());
     // 设置预购价
-    ticketBox.setPkgSalePrice(param.getPrePrice());
+    ticketBox.setPrePrice(param.getPrePrice());
     ticketBox.setPkgSalePrice(param.getPkgSalePrice());
     ticketBox.setOriginPrice(param.getOriginPrice());
     ticketBox.setSaleCommRate(param.getSaleCommRate());

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

@@ -37,7 +37,7 @@
         box_id, box_no, title, pic_url, category_id, description, sale_point, type, quantity, sale_qty, pkg_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, sort_weight, on_time, off_time, manual_off, status, is_deleted, created_time, updated_time
     </sql>
 
-    <select id="listBySaleChannel" resultMap="BaseResultMap">
+    <select id="listBySaleChannel" resultType="com.qs.mp.admin.domain.TicketBox">
         select t1.*
         from mp_ticket_box t1
         left join mp_ticket_box_channel t2 on t1.box_id = t2.box_id