代码提交

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

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 @ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
 @Data
@@ -97,6 +98,8 @@ public class KylinOrderTicketVo implements Serializable {
     private String createdAt;
     private String updatedAt;
 
+    private List<KylinOrderTicketEntitiesVo> entitiesVoList;
+
     public void setOrderTicket(KylinOrderTickets orderTicket) {
         BeanUtils.copyProperties(orderTicket,this);
     }

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

@@ -568,11 +568,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
             if (!orderTicketData.getPayType().equals("no")) {
 
-                KylinOrderTicketEntitiesVo entitiesDataOne = mongoTemplate.findOne(Query.query(Criteria.where("orderId").is(payAgainParam.getOrderId())), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
-                if (entitiesDataOne == null) {
+                if (orderTicketData.getEntitiesVoList().size() == 0) {
                     return ResponseDto.failure("参数错误");
                 }
-                KylinOrderTicketEntitiesVo entitiesData = dataUtils.getOrderTicketEntitiesVo(entitiesDataOne.getOrderTicketEntitiesId());
+                KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0);
 
                 LinkedMultiValueMap<String, String> httpData = new LinkedMultiValueMap<String, String>();
                 httpData.add("type", "TICKET");
@@ -714,7 +713,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
                 new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketVo))
         );
-        dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
+
 
         HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>();
         orderTicketEntitiesVo.put("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
@@ -723,10 +722,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
                 new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo))
         );
-        List<KylinOrderTicketEntitiesVo> delList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
-        for (KylinOrderTicketEntitiesVo item : delList) {
-            dataUtils.delOrderTicketEntitiesRedis(item.getOrderTicketEntitiesId());
-        }
+        dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
         rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
@@ -800,7 +796,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             if (null != orderTicketVo) {
                 Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
                 KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
-                List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderTicketVo.getOrderTicketsId())), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+                List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
                 // 数据脱敏
                 for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
                     if (item.getEnterIdCode().length() == 18) {

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

@@ -441,6 +441,24 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             }
         }
 
+        if (performancesInfo.getAppStatus() == 6 || performancesInfo.getAppStatus() == 9 || performancesInfo.getAppStatus() == 10) {
+            String stopSellTime = performancesInfo.getStopSellTime();
+            String sellTime = performancesInfo.getSellTime();
+            String nowTime = DateUtil.getNowTime();
+
+            if (1 == DateUtil.compareStrDay(sellTime, nowTime)) {// 未开始
+                performancesInfo.setAppStatus(9);
+            } else { // 购买
+                performancesInfo.setAppStatus(6);
+            }
+            if (1 == DateUtil.compareStrDay(stopSellTime, nowTime)) { // 购买
+                performancesInfo.setAppStatus(6);
+            } else {// 已结束
+                performancesInfo.setAppStatus(10);
+            }
+        }
+        performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
+
         PayDetailVo payDetailVo = new PayDetailVo();
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);

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

@@ -151,6 +151,8 @@ public class DataUtils {
         if (redisUtil.hasKey(KylinRedisConst.ORDER + orderId)) {
         } else {
             KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+            List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
             redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
         }
         return (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
@@ -165,30 +167,6 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.ORDER + orderId);
     }
 
-    /**
-     * 根据订单入场人id 获取 订单入场人vo 详情
-     *
-     * @param orderEntitiesId
-     * @return list
-     */
-    public KylinOrderTicketEntitiesVo getOrderTicketEntitiesVo(String orderEntitiesId) {
-        if (redisUtil.hasKey(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId)) {
-        } else {
-            KylinOrderTicketEntitiesVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketEntitiesId").is(orderEntitiesId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
-            redisUtil.set(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId, ticketData);
-        }
-        return (KylinOrderTicketEntitiesVo) redisUtil.get(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId);
-    }
-
-    /**
-     * 删除订单redis
-     *
-     * @param orderEntitiesId
-     */
-    public void delOrderTicketEntitiesRedis(String orderEntitiesId) {
-        redisUtil.del(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId);
-    }
-
     /**
      * 获取bannerVo
      * @param bannerId