Merge branch 'pre' into bak220720_merge

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

@@ -277,6 +277,7 @@ public class DataUtils {
         if (obj != null) {
             return (KylinPerformanceVo) obj;
         } else {
+
             KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
             redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
             return performanceData;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -814,6 +814,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     log.debug("增加销量 spuId=" + orderSkuVo.getSpuId() + ",skuId=" + orderSkuVo.getSkuId());
                     redisUtils.incrSkuSaleCount(orderSkuVo.getSpuId(), orderSkuVo.getSkuId(), orderSkuVo.getNum());
                     orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
+                    if (orderVo.getDeviceFrom().equals("micropay") && GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue().equals(orderVo.getMarketType())) {
+                        orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
+                    }
                     //redis
                     redisUtils.setGoblinOrderSku(orderSkuVo.getOrderSkuId(), orderSkuVo);
                     //mongo
@@ -841,7 +844,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     mongoUtils.insertGoblinOrderLogVo(logVo);
                     //mysql
                     sqlDataSku.add(new Object[]{
-                            GoblinStatusConst.Status.ORDER_STATUS_2.getValue(), now,
+                            orderSkuVo.getStatus(), now,
                             orderSkuVo.getOrderSkuId(), now, now
                     });
                 }

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/util/MongoSlimeUtils.java

@@ -153,7 +153,7 @@ public class MongoSlimeUtils {
     }
 
     public List<KylinTicketPartnerVo> getTicketPartnerVoList(String timesId) {
-        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId)), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
+        return mongoTemplate.find(Query.query(Criteria.where("timesId").is(timesId)).with(Sort.by(Sort.Direction.ASC, "createdAt")), KylinTicketPartnerVo.class, KylinTicketPartnerVo.class.getSimpleName());
     }
 
     public void updatePerformancePartnerVoById(PerformancePartnerVo data) {

liquidnet-bus-service/liquidnet-service-slime/liquidnet-service-slime-impl/src/main/java/com/liquidnet/service/slime/util/PerformanceUtils.java

@@ -367,7 +367,7 @@ public class PerformanceUtils {
                     tickets.setUseEnd(LocalDateTime.parse(ticketTimeItem.getUseEnd(), DTF_YMD_HMS));
                     tickets.setSaleRemindMinute(60);
                     tickets.setAdvanceMinuteMember(5);
-                    tickets.setCreatedAt(LocalDateTime.parse(ticketTimeItem.getCreatedAt(), DTF_YMD_HMS));
+                    tickets.setCreatedAt(LocalDateTime.parse(kylinTicketPartnerVo.getCreatedAt(), DTF_YMD_HMS));
                     tickets.setUpdatedAt(updatedAt);
                     ticketStatus.setTicketStatusId(IDGenerator.nextSnowId());
                     ticketStatus.setTicketId(tickets.getTicketsId());