用户盲票订单详情修改

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

@@ -37,6 +37,8 @@ public class UserTicketOrderExcel {
     @Excel(name = "支付金额")
     private Integer payAmt;
 
+    @Excel(name = "优惠金额")
+    private Integer discountAmt;
 
     @Excel(name = "用户昵称")
     private String nickName;

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

@@ -1,9 +1,14 @@
 package com.qs.mp.admin.domain.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -19,6 +24,12 @@ public class UserTicketOrderDetailVO {
     @ApiModelProperty("订单id")
     private String orderId;
 
+    @ApiModelProperty("优惠金额")
+    private Integer discountAmt;
+
+    @ApiModelProperty("实付金额")
+    private Integer payAmt;
+
     @ApiModelProperty("用户昵称")
     private String nickName;
 
@@ -28,7 +39,23 @@ public class UserTicketOrderDetailVO {
     @ApiModelProperty("渠道商名称")
     private String channelName;
 
-    @ApiModelProperty("创建时间")
+    @ApiModelProperty("盲票组标题")
+    private String ticketBoxTitle;
+
+    @ApiModelProperty("盲票类型（线上或线下）")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private TicketTypeEnum ticketBoxType;
+
+    @ApiModelProperty("佣金系数")
+    private BigDecimal saleCommRate;
+
+    @ApiModelProperty("盲票数量")
+    private Integer ticketNum;
+
+    @ApiModelProperty("销售价格")
+    private Integer salePrice;
+
+    @ApiModelProperty("下单时间")
     private Date createdTime;
 
     @ApiModelProperty("票相关信息列表")

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

@@ -30,6 +30,9 @@ public class UserTicketOrderListVO {
     @ApiModelProperty("盲票销售价格")
     private Integer salePrice;
 
+    @ApiModelProperty("优惠金额")
+    private Integer discountAmt;
+
     @ApiModelProperty("实付金额")
     private Integer payAmt;
 

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

@@ -2,14 +2,11 @@ package com.qs.mp.admin.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.common.enums.TicketStatusEnum;
-import com.qs.mp.common.enums.TicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 
 /**
  * 用户盲票订单盲票详情出参类
@@ -23,19 +20,6 @@ public class UserTicketOrderTicketDetailVO {
     @ApiModelProperty("盲票序列号")
     private String serialNo;
 
-    @ApiModelProperty("销售价格")
-    private Integer salePrice;
-
-    @ApiModelProperty("盲票组标题")
-    private String ticketBoxTitle;
-
-    @ApiModelProperty("盲票形式（线上或线下）")
-    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
-    private TicketTypeEnum TicketBoxType;
-
-    @ApiModelProperty("分佣的销售额百分比")
-    private BigDecimal saleCommRate;
-
     @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
     @ApiModelProperty("盲票状态;1未付款、2已激活、3已兑奖、4付款中")
     private TicketStatusEnum status;

mp-service/src/main/java/com/qs/mp/user/domain/UserTicketOrder.java

@@ -12,6 +12,7 @@ import com.qs.mp.common.enums.CommStatusEnum;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import io.swagger.annotations.ApiModel;
@@ -91,6 +92,10 @@ public class UserTicketOrder implements Serializable {
   @TableField("ticket_num")
   private Integer ticketNum;
 
+  @ApiModelProperty("分佣的销售额百分比")
+  @TableField("sale_comm_rate")
+  private BigDecimal saleCommRate;
+
   /**
    * 订单备注
    */

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -158,6 +158,7 @@ public class UserTicketOrderServiceImpl extends
     userTicketOrder.setTitle(ticketBox.getTitle());
     userTicketOrder.setBoxId(orderSettleVO.getBoxId());
     userTicketOrder.setSalePrice(ticketBox.getSalePrice());
+    userTicketOrder.setSaleCommRate(ticketBox.getSaleCommRate());
     userTicketOrder.setOrderAmt(orderSettleVO.getOrderAmt());
     userTicketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     userTicketOrder.setPayAmt(orderSettleVO.getPayAmt());

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

@@ -56,21 +56,15 @@
     </select>
 
     <select id="listTicketDetailByOrderId" resultType="com.qs.mp.admin.domain.vo.UserTicketOrderTicketDetailVO">
-        select t3.serial_no,
-               t2.sale_price,
-               t2.title ticketBoxTitle,
-               t7.type ticketBoxType,
-               t7.sale_comm_rate,
-               t3.status,
-               t6.name prizeGrade,
-               t5.title prizeTitle
+        select t2.serial_no,
+                t2.status,
+                t4.name prizeGrade,
+                t5.title prizeTitle
         from mp_user_ticket_order_item t1
-             left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
-             left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
-             left join mp_user_hit_prize t4 on t3.ticket_id = t4.ticket_id
-             left join mp_ticket_awards_prize t5 on t4.prize_id = t5.prize_id
-             left join mp_ticket_awards t6 on t5.awards_id = t6.awards_id
-             left join mp_ticket_box t7 on t7.box_id = t2.box_id
+            left join mp_ticket t2 on t1.ticket_id = t2.ticket_id
+            left join mp_user_hit_prize t3 on t1.item_id = t3.order_item_id
+            left join mp_ticket_awards t4 on t3.awards_id = t4.awards_id
+            left join mp_ticket_awards_prize t5 on t3.prize_id = t5.prize_id
         ${ew.customSqlSegment}
     </select>
 </mapper>

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

@@ -138,6 +138,7 @@
 				t1.title,
 				t1.sale_price,
 				t1.pay_amt,
+				t1.discount_amt,
 				t2.nick_name,
 				t2.phonenumber phone,
 				t3.type boxType
@@ -149,14 +150,22 @@
 
     <select id="selectUserTicketOrderDetail" resultType="com.qs.mp.admin.domain.vo.UserTicketOrderDetailVO">
 		select t1.order_id,
-			   t1.created_time,
-			   t2.nick_name,
-			   t2.phonenumber phone,
-			   t4.name channelName
+				t1.discount_amt,
+				t1.title ticketBoxTitle,
+				t1.sale_comm_rate,
+				t1.sale_price,
+				t1.pay_amt,
+				t1.created_time,
+				t1.ticket_num,
+				t2.nick_name,
+				t2.phonenumber phone,
+				t4.name channelName,
+				t5.type ticketBoxType
 		from mp_user_ticket_order t1
-				 left join sys_user t2 on t1.user_id = t2.user_id
-				 left join mp_channel_user_rel t3 on t2.user_id = t3.user_id
-				 left join mp_channel t4 on t3.channel_id = t4.channel_id
+			left join sys_user t2 on t1.user_id = t2.user_id
+			left join mp_channel_user_rel t3 on t2.user_id = t3.user_id
+			left join mp_channel t4 on t3.channel_id = t4.channel_id
+			left join mp_ticket_box t5 on t1.box_id = t5.box_id
 		${ew.customSqlSegment}
 	</select>