+API:迁移调整验票代码（kylin to merchant, 去除登录登出，新增权限逻辑）;

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantStationCheckOrderParam.java

+package com.liquidnet.service.merchant.dto.param;
+
+import com.liquidnet.commons.lang.constant.LnsRegex;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+@ApiModel(value = "MerchantStationCheckOrderParam", description = "上载验票入参")
+@Data
+public class MerchantStationCheckOrderParam implements Serializable {
+    private static final long serialVersionUID = -6456177634242162305L;
+    @ApiModelProperty(position = 10, value = "票明细ID")
+    @NotBlank(message = "票明细ID不能为空")
+    private String ticketEntitiesId;
+    @ApiModelProperty(position = 11, value = "验票类型:1-扫码,2-手机号")
+    private String checkType;
+    @ApiModelProperty(position = 12, value = "验票时间[yyyy-MM-dd HH:mm:ss]")
+    @NotBlank(message = "验票时间不能为空")
+    @Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "验票时间格式有误")
+    private String checkedAt;
+    @ApiModelProperty(position = 13, value = "验票操作人ID")
+    @NotBlank(message = "验票操作人不能为空")
+    private String checkUserId;
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/param/MerchantStationUploadParam.java

+package com.liquidnet.service.merchant.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.Valid;
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "MerchantStationUploadParam", description = "上载入参")
+@Data
+public class MerchantStationUploadParam implements Serializable {
+    private static final long serialVersionUID = -7029677911036924098L;
+    @ApiModelProperty(position = 10, value = "票明细数据")
+    @Valid
+    List<MerchantStationCheckOrderParam> checkOrderParamList;
+    String checkClient;
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationCheckOrderVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "MerchantStationCheckOrderVo", description = "下载验票-订单响应参数")
+@Data
+public class MerchantStationCheckOrderVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 7634492610346603681L;
+    @ApiModelProperty(position = 10, value = "ID[64]")
+    private String orderTicketEntitiesId;
+    @ApiModelProperty(position = 11, value = "演出ID[64]")
+    private String performanceId;
+    @ApiModelProperty(position = 12, value = "订单ID")
+    private String orderId;
+    @ApiModelProperty(position = 13, value = "票种ID")
+    private String ticketId;
+    @ApiModelProperty(position = 14, value = "二维身份CODE")
+    private String qrCode;
+    @ApiModelProperty(position = 15, value = "订单用户姓名")
+    private String userName;
+    @ApiModelProperty(position = 16, value = "订单用户手机号")
+    private String userMobile;
+    @ApiModelProperty(position = 17, value = "入场人姓名")
+    private String enterName;
+    @ApiModelProperty(position = 18, value = "入场人手机号")
+    private String enterMobile;
+    @ApiModelProperty(position = 19, value = "出票状态:0-未出票,1-已出票")
+    private Integer status;
+    @ApiModelProperty(position = 20, value = "支付状态:0-未支付,1-已支付,2-退款中,3-已退款")
+    private Integer isPayment;
+    @ApiModelProperty(position = 21, value = "出票端:(验票app)android/ios")
+    private String checkClient;
+    @ApiModelProperty(position = 22, value = "验票类型:1-扫码,2-手机号")
+    private String checkType;
+    @ApiModelProperty(position = 23, value = "验票时间[yyyy-MM-dd HH:mm:ss]")
+    private String checkedAt;
+    @ApiModelProperty(position = 24, value = "更新时间[yyyy-MM-dd HH:mm:ss]")
+    private String updatedAt;
+
+    private static final MerchantStationCheckOrderVo obj = new MerchantStationCheckOrderVo();
+
+    public static MerchantStationCheckOrderVo getNew() {
+        try {
+            return (MerchantStationCheckOrderVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new MerchantStationCheckOrderVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationCheckRefreshVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "MerchantStationCheckRefreshVo", description = "下载刷新验票信息响应参数")
+@Data
+public class MerchantStationCheckRefreshVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -6108305147829613655L;
+    private MerchantStationPerformanceVo performanceVo;
+    private List<MerchantStationCheckOrderVo> checkOrderVos;
+
+    private static final MerchantStationCheckRefreshVo obj = new MerchantStationCheckRefreshVo();
+
+    public static MerchantStationCheckRefreshVo getNew() {
+        try {
+            return (MerchantStationCheckRefreshVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new MerchantStationCheckRefreshVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationPerformanceVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel(value = "MerchantStationPerformanceVo", description = "演出列表响应参数")
+@Data
+public class MerchantStationPerformanceVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = 2904227908512047961L;
+    @ApiModelProperty(position = 10, value = "演出ID[64]")
+    private String performancesId;
+    @ApiModelProperty(position = 11, value = "类型[101-音乐节,102小型演出(livehouse演出),103巡演]")
+    private Integer type;
+    @ApiModelProperty(position = 12, value = "演出标题[255]")
+    private String title;
+    @ApiModelProperty(position = 13, value = "开始时间[yyyy/MM/dd]")
+    private String timeStart;
+    @ApiModelProperty(position = 14, value = "结束时间[yyyy/MM/dd]")
+    private String timeEnd;
+    @ApiModelProperty(position = 15, value = "城市名称")
+    private String cityName;
+    @ApiModelProperty(position = 16, value = "场地名称")
+    private String fieldName;
+    @ApiModelProperty(position = 17, value = "票种列表信息")
+    private List<MerchantStationTicketVo> ticketVoList;
+    @ApiModelProperty(position = 18, value = "可下载时间")
+    private String canDownTime;
+    @ApiModelProperty(position = 20, value = "票房")
+    private BigDecimal priceSum;
+    @ApiModelProperty(position = 21, value = "票量[9]")
+    private Integer number;
+    @ApiModelProperty(position = 22, value = "已验票量[9]")
+    private Integer checkedNum;
+    @ApiModelProperty(position = 23, value = "余量[9]")
+    private Integer remainderNum;
+
+    @ApiModelProperty(position = 29, value = "权限（多个权限以.分隔）[4-销售统计|5-验票]")
+    private String permissionIds;
+    @ApiModelProperty(position = 30, value = "#过程数据，前端无需关注")
+    private List<KylinTicketTimesVo> ticketTimeList;
+
+    private static final MerchantStationPerformanceVo obj = new MerchantStationPerformanceVo();
+
+    public static MerchantStationPerformanceVo getNew() {
+        try {
+            return (MerchantStationPerformanceVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new MerchantStationPerformanceVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/dto/vo/MerchantStationTicketVo.java

+package com.liquidnet.service.merchant.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@ApiModel(value = "MerchantStationTicketVo", description = "票种统计信息")
+@Data
+public class MerchantStationTicketVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -2995250476517713387L;
+    @ApiModelProperty(position = 10, value = "票种ID[64]")
+    private String ticketId;
+    @ApiModelProperty(position = 11, value = "名称[32]")
+    private String title;
+    @ApiModelProperty(position = 12, value = "单价(8,2)")
+    private BigDecimal price;
+    @ApiModelProperty(position = 13, value = "适用开始时间")
+    private String useStart;
+    @ApiModelProperty(position = 14, value = "适用结束时间")
+    private String useEnd;
+    @ApiModelProperty(position = 15, value = "票房")
+    private BigDecimal priceSum;
+    @ApiModelProperty(position = 16, value = "票量[9]")
+    private Integer number;
+    @ApiModelProperty(position = 17, value = "已验票量[9]")
+    private Integer checkedNum;
+    @ApiModelProperty(position = 18, value = "余量[9]")
+    private Integer remainderNum;
+
+    private static final MerchantStationTicketVo obj = new MerchantStationTicketVo();
+
+    public static MerchantStationTicketVo getNew() {
+        try {
+            return (MerchantStationTicketVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new MerchantStationTicketVo();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/ObjectUtil.java

@@ -2,10 +2,13 @@ package com.liquidnet.service.merchant.util;
 
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformancePartnerListVo;
 import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
 import com.liquidnet.service.merchant.dto.vo.*;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.WriteModel;
+import org.bson.Document;
 
 import java.util.ArrayList;
 
@@ -21,13 +24,19 @@ public class ObjectUtil {
 
     private static final PagedResult<MerchantSponsorsVo> merchantSponsorsVoPagedResult = new PagedResult<>();
 
+    private static final ArrayList<MerchantStationPerformanceVo> merchantStationPerformanceVoArrayList = new ArrayList<>();
+    private static final ArrayList<MerchantStationTicketVo> merchantStationTicketVoArrayList = new ArrayList<>();
+    private static final PagedResult<MerchantStationPerformanceVo> merchantStationPerformanceVoPagedResult = new PagedResult<>();
+
     private static final BasicDBObject basicDBObject = new BasicDBObject();
+    private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
 
 
     private static final ArrayList<PerformancePartnerListDao> performancePartnerListDaoArrayList = new ArrayList<>();
     private static final ArrayList<TicketTimesTicketCreatePartnerVo> ticketTimesTicketCreatePartnerVoList = new ArrayList<>();
     private static final ArrayList<KylinPerformancePartnerListVo> performancePartnerListVo = new ArrayList<>();
     private static final ArrayList<MerchantAuthorizationPerformanceVo> permissionVoList = new ArrayList<>();
+    private static final ArrayList<KylinTicketVo> kylinTicketVoArrayList = new ArrayList<>();
 
     public static ArrayList<PerformancePartnerListDao> getPerformancePartnerListDaoArrayList() {
         return (ArrayList<PerformancePartnerListDao>) performancePartnerListDaoArrayList.clone();
@@ -69,7 +78,27 @@ public class ObjectUtil {
         return (ArrayList<MerchantSponsorAppliesVo>) merchantSponsorAppliesVoArrayList.clone();
     }
 
+    public static ArrayList<MerchantStationPerformanceVo> getMerchantStationPerformanceVoArrayList() {
+        return (ArrayList<MerchantStationPerformanceVo>) merchantStationPerformanceVoArrayList.clone();
+    }
+
+    public static ArrayList<MerchantStationTicketVo> getMerchantStationTicketVoArrayList() {
+        return (ArrayList<MerchantStationTicketVo>) merchantStationTicketVoArrayList.clone();
+    }
+
+    public static PagedResult<MerchantStationPerformanceVo> getMerchantStationPerformanceVoPagedResult() {
+        return merchantStationPerformanceVoPagedResult.clone();
+    }
+
     public static BasicDBObject cloneBasicDBObject() {
         return (BasicDBObject) basicDBObject.clone();
     }
+
+    public static ArrayList<WriteModel<Document>> getWriteModelDocumentArrayList() {
+        return (ArrayList<WriteModel<Document>>) writeModelDocumentArrayList.clone();
+    }
+
+    public static ArrayList<KylinTicketVo> getKylinTicketVoArrayList() {
+        return (ArrayList<KylinTicketVo>) kylinTicketVoArrayList.clone();
+    }
 }

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/errors.properties

@@ -62,3 +62,9 @@
 29999=无权限
 
 
+
+# 专业版APP
+130901=当前账号无关联演出数据
+130902=当前账号未关联当前演出
+130903=当前演出还未开放下载
+

liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/resources/sqlmap.properties

@@ -21,7 +21,9 @@ merchant_authorization_permissions.insert=INSERT INTO merchant_authorization_per
 
 
 
-
+#  ---------------------------------------------------------------------------------------------------------------------
+kylin_order_ticket_entities.update_status_bystation=UPDATE kylin_order_ticket_entities SET `status`=?,check_client=?,updated_at=? WHERE order_ticket_entities_id=?
+#  ---------------------------------------------------------------------------------------------------------------------