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

Dev

See merge request quanshu/mp-server!717

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

@@ -202,6 +202,7 @@ public class SaleSiteMgrController extends BaseApiController {
 			channelExcel.setCommRate(channelVO.getCommRate());
 			channelExcel.setName(channelVO.getName());
 			channelExcel.setParentsName(channelVO.getParentsName());
+			channelExcel.setCreatedTime(channelVO.getCreatedTime());
 			if (Objects.nonNull(channelVO.getCertifyStatus())) {
 				channelExcel.setCertifyStatus(channelVO.getCertifyStatus().getDesc());
 			}

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

@@ -253,6 +253,14 @@ public class UserTicketOrderMgrController extends BaseApiController {
                 userTicketOrderItemExcel.setTicketType(userTicketOrderItemVO.getTicketType().getDesc());
             }
 
+            if (Objects.nonNull(userTicketOrderItemVO.getIsPre())) {
+                if (userTicketOrderItemVO.getIsPre() == 1) {
+                    userTicketOrderItemExcel.setIsPre("是");
+                } else {
+                    userTicketOrderItemExcel.setIsPre("否");
+                }
+            }
+
             if (Objects.nonNull(userTicketOrderItemVO.getTicketStatus())) {
                 userTicketOrderItemExcel.setTicketStatus(userTicketOrderItemVO.getTicketStatus().getDesc());
             }

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

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 经销商导出
@@ -30,6 +31,9 @@ public class ChannelExcel {
     @Excel(name = "经销商佣金比例(%)")
     private BigDecimal commRate;
 
+    @Excel(name = "注册时间")
+    private Date createdTime;
+
     @Excel(name = "上级渠道")
     String parentsName;
 

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

@@ -29,6 +29,9 @@ public class UserTicketOrderItemExcel {
     @Excel(name = "盲票类型")
     private String ticketType;
 
+    @Excel(name = "是否为预付票")
+    private String isPre;
+
     @Excel(name = "盲票售价(元)")
     private BigDecimal salePrice;
 

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

@@ -29,6 +29,9 @@ public class UserTicketOrderItemVO {
     @ApiModelProperty("盲票类型")
     private TicketTypeEnum ticketType;
 
+    @ApiModelProperty("是否预付票,0否,1是")
+    private Integer isPre;
+
     @ApiModelProperty("盲票售价")
     private Integer salePrice;
 

mp-service/src/main/resources/mapper/user/UserTicketOrderItemMapper.xml

@@ -73,6 +73,7 @@
         select t3.serial_no,
                t1.title ticketTitle,
                t2.resource ticketType,
+                t9.is_pre,
                t2.sale_price ,
                t2.sale_comm_rate,
                t3.status ticketStatus,
@@ -94,6 +95,7 @@
                  left join mp_ticket_awards_prize t6 on t4.prize_id = t6.prize_id
                  left join mp_channel t7 on t2.channel_id = t7.channel_id
                  left join sys_user t8 on t1.user_id = t8.user_id
+                left join mp_ticket_package t9 on t3.pkg_id = t9.pkg_id
         ${ew.customSqlSegment}
     </select>