提交代码

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

@@ -2,6 +2,7 @@ package com.liquidnet.commons.lang.util;
 
 import java.net.NetworkInterface;
 import java.net.SocketException;
+import java.util.Arrays;
 import java.util.Enumeration;
 
 public class IDGenerator {
@@ -65,18 +66,35 @@ public class IDGenerator {
         return ((timestamp - twepoch) << timestampLeftShift) | (dataCenterId << dataCenterIdShift) | (workerId << workerIdShift) | sequence;
     }
 
+    /**
+     * 根据订单id生成订单号
+     *
+     * @param orderTicketId
+     * @return
+     */
     public static String ticketOrderCode(String orderTicketId) {
         String number = orderTicketId;
         int len = orderTicketId.length();
         String time = System.currentTimeMillis() / 1000 + "";
         String orderCode = "T" + number.substring(0, len - 4);
-        orderCode+=time.substring(7, 8);
-        orderCode+=number.substring(len - 2);
-        orderCode+=time.substring(8, 9);
-        orderCode+=number.substring(len - 4, len-2);
+        orderCode += time.substring(7, 8);
+        orderCode += number.substring(len - 2);
+        orderCode += time.substring(8, 9);
+        orderCode += number.substring(len - 4, len - 2);
         return orderCode;
     }
 
+    /**
+     * 根据 订单号生成qrCode
+     *
+     * @param orderTicketId
+     * @return String
+     */
+    public static String ticketQrCode(String orderTicketId) {
+        String qrCode = MD5Utils.md5(orderTicketId).toLowerCase();
+        return "QR" + qrCode.substring(5) + "" + qrCode.substring(0, 4);
+    }
+
     private static long genTime() {
         return useSystemClock ? SystemClock.now() : System.currentTimeMillis();
     }

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

@@ -17,6 +17,9 @@ liquidnet:
     level-root: info
   mysql:
     database-name: dev_ln_scene
+  url-pay:
+    pay: "http://testpay.zhengzai.tv/"
+    check: "http://testpay.zhengzai.tv/order/verify"
 
 #以下为spring各环境个性配置
 spring:

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

@@ -8,8 +8,11 @@ public class KylinRedisConst {
     public static final String SURPLUS_GENERAL = "surplusGeneral";
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
     public static final String TICKET = "kylin:ticket:info";
+    public static final String ORDER = "kylin:order:info";
+    public static final String ORDER_ENTITIES = "kylin:order_entities:info";
     public static final String TIMES = "kylin:times:id";
     public static final String BANNERS = "kylin:banners";
+    public static final String AGENT = "kylin:agent:info";
 
     public static final String CHECK_USER = "kylin:checkUser";
     public static final String CHECK_USER_RELATION = "kylin:checkUser:relation";

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayAgainParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class PayAgainParam {
+    @ApiModelProperty(value = "订单id")
+    @NotNull(message = "必传")
+    private String orderId;
+    @ApiModelProperty(value = "支付类型")
+    @NotNull(message = "必传")
+    private String payType;
+    @ApiModelProperty(value = "支付来源")
+    @NotNull(message = "必传")
+    private String deviceFrom;
+    @ApiModelProperty(value = "openId")
+    private String openId;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/SyncOrderParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class SyncOrderParam {
+    @ApiModelProperty(value = "status")
+    private Integer status;
+    @ApiModelProperty(value = "type")
+    private String type;
+    @ApiModelProperty(value = "code")
+    private String code;
+    @ApiModelProperty(value = "payment_id")
+    private String payment_id;
+    @ApiModelProperty(value = "order_code")
+    private String order_code;
+    @ApiModelProperty(value = "price")
+    private BigDecimal price;
+    @ApiModelProperty(value = "payment_type")
+    private String payment_type;
+}

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class KylinOrderListVo implements Serializable {
+    private static final long serialVersionUID = 6554829077875538374L;
+    private String orderTicketsId;
+    private String performanceTitle;
+    private String performanceImg;
+    private String timeStart;
+    private String ticketTitle;
+    private String useStart;
+    private String overdueAt;
+    private int canBuyTime;
+    private BigDecimal priceActual;
+    private Integer number;
+    private Integer status;
+    private String createdAt;
+}

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

@@ -22,4 +22,9 @@ public class KylinOrderTicketEntitiesVo implements Serializable {
     private Integer sysDamai;
     private String checkClient;
     private Integer isPayment;
+
+    private String performanceTitle;
+    private String ticketTitle;
+    private String useStart;
+    private String useEnd;
 }

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

@@ -25,6 +25,10 @@ public class KylinOrderTicketVo implements Serializable {
     private String userMobile;
     @ApiModelProperty(position = 14, value = "演出名称")
     private String performanceTitle;
+    private String ticketTitle;
+    private String timeStart;
+    private String useStart;
+    private String performanceImg;
     @ApiModelProperty(position = 15, value = "订单号")
     private String orderCode;
     @ApiModelProperty(position = 16, value = "支付单号")
@@ -88,6 +92,10 @@ public class KylinOrderTicketVo implements Serializable {
     private String agentId;
     private Integer isMember;
 
+    private String overdueAt;
+    private String createdAt;
+    private String updatedAt;
+
     public void setOrderTicket(KylinOrderTickets orderTicket) {
         BeanUtils.copyProperties(orderTicket,this);
     }

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

@@ -14,6 +14,8 @@ public class PayResultVo implements Serializable {
 
     private String order_code;
 
+    private Integer status;
+
     private String order_id;
 
     private BigDecimal price;

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

 package com.liquidnet.service.kylin.service;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
+import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.PayResultVo;
@@ -21,24 +25,28 @@ import java.util.List;
 public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
 
     // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo>checkCanOrder(PayOrderParam payOrderParam);
+    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
 
-    // 下单接口(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData);
-
-        // 再次支付(待支付->可支付->倒计时结束释放库存)
-
-    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
+    // 再次支付(待支付->可支付->倒计时结束释放库存)
+    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
 
     // 支付回调(待支付->已支付->中断倒计时)
+    String syncOrder(SyncOrderParam syncOrderParam);
 
     // 同步大麦数据接口
 
-    // 代理票务 可买状态判断
-
     //订单列表(状态 待支付 已支付 倒计时 已失效)
+    PageInfo<List<KylinOrderListVo>> orderList(int page,int size);
 
     //订单详情
 
     //TASK 倒计时
+    boolean checkOrderTime(String userId);
+
+    // 下单接口(无订单->待支付->可支付)
+    // 删除订单
+    // 代理票务 可买状态判断
+    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
+    // ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData,Object adamEntersList);
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketEntities.java

@@ -123,4 +123,14 @@ public class KylinOrderTicketEntities implements Serializable {
                 createdAt, updatedAt
         };
     }
+
+    /**
+     * 获取 支付回调 数据库参数
+     * @return
+     */
+    public Object[] getSynOrderObject() {
+        return new Object[]{
+                orderId,  isPayment, updatedAt
+        };
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java

@@ -79,4 +79,14 @@ public class KylinOrderTicketStatus implements Serializable {
         };
     }
 
+    /**
+     * 获取 支付回调 数据库参数
+     * @return
+     */
+    public Object[] getSynOrderObject() {
+        return new Object[]{
+                orderId,  status,payStatus, updatedAt
+        };
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -190,6 +190,7 @@ public class KylinOrderTickets implements Serializable {
 
     /**
      * 获取 添加 数据库参数
+     *
      * @return
      */
     public Object[] getAddObject() {
@@ -201,4 +202,26 @@ public class KylinOrderTickets implements Serializable {
         };
     }
 
+    /**
+     * 获取 再次支付 数据库参数
+     *
+     * @return
+     */
+    public Object[] getPayAgainObject() {
+        return new Object[]{
+                orderTicketsId, orderType, updatedAt, orderCode
+        };
+    }
+
+    /**
+     * 获取 支付回调 数据库参数
+     *
+     * @return
+     */
+    public Object[] getSynOrderObject() {
+        return new Object[]{
+                orderTicketsId, paymentType, payCode, timePay, qrCode, updatedAt
+        };
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -511,9 +511,6 @@ CREATE TABLE `kylin_order_ticket_entities`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT '订单详情';
 
--- 大麦同步记录 TODO 待定
--- 验票相关 TODO 待定
--- 会员权益修改表 TODO 待定
 -- 订单退款 <初步>
 drop TABLE if exists `kylin_order_tickets_refund`;
 CREATE TABLE `kylin_order_tickets_refund`
@@ -589,6 +586,85 @@ CREATE TABLE `kylin_check_user_performances`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT '验票用户可看演出表';
 
+
+-- 快递相关临时
+CREATE TABLE `express_batches` (
+                                   `id` int unsigned NOT NULL AUTO_INCREMENT,
+                                   `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
+                                   `order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id，订阅前查询',
+                                   `order_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单',
+                                   `order_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+                                   `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司名称',
+                                   `company` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司编号',
+                                   `number` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递单号',
+                                   `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态 0新导入 1订阅成功 2订阅失败',
+                                   `import_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '导入时间',
+                                   `batch` int NOT NULL DEFAULT '0' COMMENT '导入批次',
+                                   `reason` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '失败原因',
+                                   `created_at` timestamp NULL DEFAULT NULL,
+                                   `updated_at` timestamp NULL DEFAULT NULL,
+                                   PRIMARY KEY (`id`),
+                                   KEY `express_batches_batch_index` (`batch`),
+                                   KEY `express_batches_company_index` (`company`),
+                                   KEY `express_batches_number_index` (`number`),
+                                   KEY `express_batches_order_code_index` (`order_code`),
+                                   KEY `express_batches_order_type_index` (`order_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=34781 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `express_logs` (
+                                `id` int unsigned NOT NULL AUTO_INCREMENT,
+                                `order_id` int NOT NULL COMMENT '订单id',
+                                `order_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单',
+                                `admin_id` int NOT NULL DEFAULT '0' COMMENT '修改人id',
+                                `admin_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '修改人名称',
+                                `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递联系人',
+                                `mobile` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递联系电话',
+                                `address` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递收货地址',
+                                `created_at` timestamp NULL DEFAULT NULL,
+                                `updated_at` timestamp NULL DEFAULT NULL,
+                                PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=487 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `express_batches` (
+                                   `id` int unsigned NOT NULL AUTO_INCREMENT,
+                                   `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
+                                   `order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id，订阅前查询',
+                                   `order_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单',
+                                   `order_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+                                   `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司名称',
+                                   `company` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司编号',
+                                   `number` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递单号',
+                                   `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态 0新导入 1订阅成功 2订阅失败',
+                                   `import_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '导入时间',
+                                   `batch` int NOT NULL DEFAULT '0' COMMENT '导入批次',
+                                   `reason` varchar(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '失败原因',
+                                   `created_at` timestamp NULL DEFAULT NULL,
+                                   `updated_at` timestamp NULL DEFAULT NULL,
+                                   PRIMARY KEY (`id`),
+                                   KEY `express_batches_batch_index` (`batch`),
+                                   KEY `express_batches_company_index` (`company`),
+                                   KEY `express_batches_number_index` (`number`),
+                                   KEY `express_batches_order_code_index` (`order_code`),
+                                   KEY `express_batches_order_type_index` (`order_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=34781 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC;
+CREATE TABLE `expresses` (
+                             `id` int unsigned NOT NULL AUTO_INCREMENT,
+                             `admin_id` int NOT NULL DEFAULT '0' COMMENT '管理员',
+                             `order_id` int NOT NULL DEFAULT '0' COMMENT '订单Id',
+                             `order_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '订单编号',
+                             `order_type` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '订单类型 order_product 商品订单 , order_ticket 票务订单, order_integration 积分订单',
+                             `status` tinyint NOT NULL DEFAULT '-1' COMMENT '状态 -1待揽收、0在途中、1已揽收、2疑难、3已签收',
+                             `number` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT '' COMMENT '快递单号',
+                             `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司名称',
+                             `company` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '' COMMENT '快递公司编号',
+                             `created_at` timestamp NULL DEFAULT NULL,
+                             `updated_at` timestamp NULL DEFAULT NULL,
+                             PRIMARY KEY (`id`),
+                             KEY `expresses_number_index` (`number`),
+                             KEY `expresses_order_code_index` (`order_code`),
+                             KEY `expresses_order_id_index` (`order_id`),
+                             KEY `expresses_order_type_index` (`order_type`)
+) ENGINE=InnoDB AUTO_INCREMENT=56762 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='快递表';
+
+
 insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
                                 `updated_at`, `title`)
 values ('1', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png',

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

 package com.liquidnet.service.kylin.controller;
 
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
+import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.PayResultVo;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
 import io.swagger.annotations.Api;
@@ -11,6 +15,8 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单 前端控制器
@@ -34,4 +40,32 @@ public class KylinOrderTicketsController {
         return orderTicketsService.checkCanOrder(payOrderParam);
     }
 
+    @PostMapping("payAgain")
+    @ApiOperation("再次支付")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PayResultVo> payAgain(@RequestBody PayAgainParam payAgainParam) {
+        return orderTicketsService.payAgain(payAgainParam);
+    }
+
+    @PostMapping("syncOrder")
+    @ApiOperation("支付回调")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public String payAgain(@RequestBody SyncOrderParam syncOrderParam) {
+        return orderTicketsService.syncOrder(syncOrderParam);
+    }
+
+    @GetMapping("list")
+    @ApiOperation("订单列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<List<KylinOrderListVo>>> payAgain(@RequestParam("page") int page,
+                                                                  @RequestParam("size") int size) {
+        return ResponseDto.success(orderTicketsService.orderList(page,size));
+    }
+
+    @GetMapping("checkOrderTime")
+    @ApiOperation("订单过期脚本")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> checkOrderTime() {
+        return ResponseDto.success(orderTicketsService.checkOrderTime(null));
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinPerformancesAdminServiceImpl.java

@@ -239,11 +239,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             performanceRelations.setRoadShowId(roadShowId);
             performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
 
-            //redis TODO 演出缓存
-//        if(redisUtil.hHasKey(KylinRedisConst.PERFORMANCES,performancesId)){
-//            redisUtil.hset()
-//        }
-
             //mongodb
             HashMap<String, Object> map = new HashMap<>();
             map.put("roadShowId", roadShowId);

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

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.*;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
@@ -143,4 +141,32 @@ public class DataUtils {
         }
         return (KylinTicketVo) redisUtil.hget(KylinRedisConst.TICKET,ticketId);
     }
+
+    /**
+     * 根据订单id 获取 订单vo 详情
+     * @param orderId
+     * @return
+     */
+    public KylinOrderTicketVo getOrderTicketVo(String orderId){
+        if(redisUtil.hHasKey(KylinRedisConst.ORDER,orderId)){
+        }else{
+            KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+            redisUtil.hset(KylinRedisConst.ORDER,orderId,ticketData);
+        }
+        return (KylinOrderTicketVo) redisUtil.hget(KylinRedisConst.ORDER,orderId);
+    }
+
+    /**
+     * 根据订单入场人id 获取 订单入场人vo 详情
+     * @param orderEntitiesId
+     * @return list
+     */
+    public KylinOrderTicketEntitiesVo getOrderTicketEntitiesVo(String orderEntitiesId){
+        if(redisUtil.hHasKey(KylinRedisConst.ORDER_ENTITIES,orderEntitiesId)){
+        }else{
+            KylinOrderTicketEntitiesVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            redisUtil.hset(KylinRedisConst.ORDER_ENTITIES,orderEntitiesId,ticketData);
+        }
+        return (KylinOrderTicketEntitiesVo) redisUtil.hget(KylinRedisConst.ORDER_ENTITIES,orderEntitiesId);
+    }
 }

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

-kylin_order_ticket_entities.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket_entities.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file
+kylin_order_ticket_entities.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file

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

-kylin_order_ticket_status.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket_status.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file
+kylin_order_ticket_status.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket_status.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file

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

-kylin_order_ticket.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket.add=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file
+kylin_order_ticket.payAgain=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket.synPay=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
+kylin_order_ticket.close=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=? 
\ No newline at end of file