我的盲票增加预付票类型

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

@@ -126,6 +126,9 @@ public class ChannelOrderController extends BaseApiController {
    */
   @PostMapping("/order/list")
   @ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
+  @ApiResponses(
+          @ApiResponse(code = 200, message = "成功", response = ChannelOrderVO.class)
+  )
   public TableDataInfo list(@RequestBody JSONObject param) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     Integer status = param.getInteger("status");

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

@@ -0,0 +1,54 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 异步任务类型枚举
+ * @author Cup
+ * @date 2022/6/7
+ */
+@ApiModel("异步任务类型枚举")
+public enum AsyncTaskTypeEnum implements IEnum<Integer> {
+    PRE_COMMISSION(1,"预付票分佣");
+
+    private Integer value;
+    private String desc;
+
+    AsyncTaskTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public static AsyncTaskTypeEnum getByValue(String value){
+        for (AsyncTaskTypeEnum asyncTaskTypeEnum : AsyncTaskTypeEnum.values()) {
+            if (asyncTaskTypeEnum.getValue().equals(value)) {
+                return asyncTaskTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 重写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/channel/domain/vo/ChannelMyTicketVO.java

@@ -2,7 +2,9 @@ package com.qs.mp.channel.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.qs.mp.common.enums.ChannelOrderTypeEnum;
 import com.qs.mp.common.enums.TicketPkgSaleStatusEnum;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -50,11 +52,26 @@ public class ChannelMyTicketVO {
     @ApiModelProperty("面值")
     private Integer facePrice;
 
+    @ApiModelProperty("盲票类型")
+    private TicketTypeEnum ticketType;
+
+    @ApiModelProperty("是否预付票,0否,1是")
+    private Integer isPre;
 
     @ApiModelProperty("创建时间")
     private Date createdTime;
 
-
-
+    @ApiModelProperty("票包类型")
+    public ChannelOrderTypeEnum getType() {
+        if (this.isPre == 0){
+            return ChannelOrderTypeEnum.RETAIL;
+        } else {
+            if (TicketTypeEnum.OFFLINE.equals(this.ticketType)){
+                return ChannelOrderTypeEnum.OFFLINE_PRE;
+            }else {
+                return ChannelOrderTypeEnum.ONLINE_PRE;
+            }
+        }
+    }
 
 }

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

@@ -431,7 +431,7 @@ public class UserTicketOrderServiceImpl extends
   }
 
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public boolean commToChannel(String orderId) {
     UserTicketOrder ticketOrder = getById(orderId);
     Assert.isTrue(ticketOrder.getCommStatus() == CommStatusEnum.DOING,

mp-service/src/main/resources/mapper/channel/ChannelOrderDetailMapper.xml

@@ -33,7 +33,9 @@
                t2.pkg_unit,
                t3.title,
                t3.pic_url,
-               t3.face_price
+               t3.face_price,
+                t2.is_pre,
+                t3.type ticketType
         FROM mp_channel_order_detail t1
          LEFT JOIN mp_ticket_package t2 ON t1.pkg_id = t2.pkg_id
          LEFT JOIN mp_ticket_box t3 ON t2.box_id = t3.box_id