Merge branch 'hjc_pda_change' into pre

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/ObjectUtil.java

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/CheckData.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class CheckData implements Serializable, Cloneable {
+    @ApiModelProperty(value = "0未检票，1已检票")
+    private int check_status;
+    @ApiModelProperty(value = "0-正常|1-黑名单")
+    private String check_time;
+    @ApiModelProperty(value = "票提")
+    private String enter_idcode;
+    @ApiModelProperty(value = "抽成票提")
+    private String enter_mobile;
+    @ApiModelProperty(value = "代理id")
+    private String enter_name;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_entity_id;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_id;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_name;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_price;
+    @ApiModelProperty(value = "1单日票 2通票")
+    private Integer ticket_type;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_use_end;
+    @ApiModelProperty(value = "总代id")
+    private String ticket_use_start;
+    @ApiModelProperty(value = "总代id")
+    private Integer ticket_count;
+    @ApiModelProperty(value = "总代id")
+    private Boolean select_status;
+
+    private static final CheckData obj = new CheckData();
+
+    public static CheckData getNew() {
+        try {
+            return (CheckData) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CheckData();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTempService.java

@@ -2,8 +2,12 @@ package com.liquidnet.service.kylin.service;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.CheckData;
 import com.liquidnet.service.kylin.dto.vo.WqTempVo;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 补偿接口 胡佳晨
@@ -22,5 +26,9 @@ public interface IKylinTempService {
 
     ResponseDto<WqTempVo> getWqTempExpress(String orderId);
 
-    ResponseDto<Boolean> updateMailNo(String orderId,String mailNo);
+    ResponseDto<Boolean> updateMailNo(String orderId, String mailNo);
+
+    ResponseDto<List<CheckData>> getCheckData(String performance_id, String idcode, String[] ticket_ids);
+
+    ResponseDto<List<CheckData>> checkTicket(String performance_id, String idcode, String remarks, String[] ticket_ids, String check_time);
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -122,6 +122,7 @@ global-auth:
     - ${liquidnet.info.context}/partner/performance/**
     # banner
     - ${liquidnet.info.context}/banners/**
+    - ${liquidnet.info.context}/pda/**
     - ${liquidnet.info.context}/order/checkOrderTime
     - ${liquidnet.info.context}/order/syncOrder
     # 退款回掉

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/CheckDataController.java

+package com.liquidnet.service.kylin.controller;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.CheckData;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+import com.liquidnet.service.kylin.service.IKylinTempService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+@Api(tags = "pda验票接口")
+@RestController
+@RequestMapping("pda")
+@Slf4j
+public class CheckDataController {
+
+    @Autowired
+    private IKylinTempService kylinTempService;
+
+    @GetMapping("checked")
+    @ApiOperation("查询入场的已检票数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "performance_id", value = "演出id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "idcode", value = "证件号", required = true),
+            @ApiImplicitParam(type = "query", dataType = "ArrayList", name = "ticket_ids", value = "票id", required = true),
+
+    })
+    public HashMap<String, Object> getCheckData(String performance_id, String idcode, String[] ticket_ids) {
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
+        map.put("check_data", kylinTempService.getCheckData(performance_id, idcode, ticket_ids).getData());
+        return map;
+    }
+
+    @PostMapping("check")
+    @ApiOperation("检票")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "performance_id", value = "演出id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "idcode", value = "证件号", required = true),
+            @ApiImplicitParam(type = "query", dataType = "ArrayList", name = "ticket_ids", value = "票id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "remarks", value = "设备号", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "check_time", value = "验票时间", required = true),
+    })
+    public HashMap<String, Object> checkTicket(String performance_id, String idcode, String remarks, String[] ticket_ids, String check_time) {
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
+        map.put("check_data", kylinTempService.checkTicket(performance_id, idcode, remarks, ticket_ids, check_time).getData());
+        map.put("check_time", check_time);
+        return map;
+    }
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/ObjectUtil.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.utils;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.CheckData;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
 import com.liquidnet.service.kylin.dto.vo.KylinRecommendActiveRelationVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
@@ -44,6 +45,7 @@ public class ObjectUtil {
     private static final ArrayList<NoticeGoblinMixDetailsVo> noticeGoblinMixDetailsVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinMixDetailsVo> goblinMixDetailsVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinGoodsSkuInfoVo> goblinGoodsSkuInfoVoArrayList = new ArrayList<>();
+    private static final ArrayList<CheckData> checkData = new ArrayList<>();
 
 
     public static ArrayList<KylinRecommendActiveRelation> getKylinRecommendActiveRelation() {
@@ -53,6 +55,11 @@ public class ObjectUtil {
         return (ArrayList<KylinCandyVo>) kylinCandyVos.clone();
     }
 
+    public static ArrayList<CheckData> checkDataArrayList() {
+        return (ArrayList<CheckData>) checkData.clone();
+    }
+
+
     public static ArrayList<KylinRecommendActiveRelationVo> getKylinRecommendActiveRelationVo(){
         return (ArrayList<KylinRecommendActiveRelationVo>) kylinRecommendActiveRelationVos.clone();
     }

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

@@ -37,4 +37,6 @@ kylin_perform_sub.insert=INSERT INTO kylin_perform_sub (perform_sub_id,performan
 kylin_order_express_ex.insert = INSERT INTO kylin_order_express_ex (`order_id`,`express_contacts`,`express_address`,`province`,`city`,`county`,`express_phone`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
 kylin_order_express_ex.sendMail = UPDATE kylin_order_express_ex SET mail_no = ? , updated_at = ? where order_id = ?
 # ------------------------ ar演出队列 ----------------------------
-kylin_ar_ticket.update =update kylin_ticket_active set state=?,redeem_uid= ?,redeem_at= ? where `code`= ?
\ No newline at end of file
+kylin_ar_ticket.update =update kylin_ticket_active set state=?,redeem_uid= ?,redeem_at= ? where `code`= ?
+
+kylin_order_ticket_entities.update_status_bystation_pad=UPDATE kylin_order_ticket_entities SET `status`=?,check_client=?,updated_at=?, comment=? WHERE order_ticket_entities_id=?