修改 脚本库存脚本

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

@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getCloseOrderObject() {
         return new Object[]{
-                status, updatedAt, orderId,updateTime,createTime
+                status, updatedAt, orderId
         };
     }
 }

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

@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
+    public Object[] getCloseOrderObject() {
         return new Object[]{
-                updatedAt, orderTicketsId,updateTime,createTime
+                updatedAt, orderTicketsId
         };
     }
 }

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

@@ -346,7 +346,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         //生成订单 order_ticket
         KylinOrderTickets orderTickets = new KylinOrderTickets();
         String orderTicketId = IDGenerator.nextSnowId().toString();
-        log.debug("\n ORDER_TICKET_ID = "+ orderTicketId +" \n TIME = "+System.currentTimeMillis());
+        log.debug("\n ORDER_TICKET_ID = " + orderTicketId + " \n TIME = " + System.currentTimeMillis());
         orderTickets.setOrderTicketsId(orderTicketId);
         orderTickets.setUserId(uid);
         Map token = CurrentUtil.getTokenClaims();
@@ -549,7 +549,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         httpData.add("client_ip", CurrentUtil.getCliIpAddr());
         httpData.add("notify_url", synUrl);
         httpData.add("create_date", orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        httpData.add("expire_time", orderTickets.getPayCountdownMinute().toString());
+        httpData.add("expire_time", (orderTickets.getPayCountdownMinute() + 1) + "");
 
         if (payOrderParam.getDeviceFrom().equals("js") || payOrderParam.getDeviceFrom().equals("applet")) {
             httpData.add("open_id", payOrderParam.getOpenId());
@@ -1020,21 +1020,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         if (redisLockUtil.tryLock(lock, 1, 3600)) {
             try {
                 List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
-                HashMap<String, Integer> map2 = new HashMap<>();
-                Integer count = 0;
-                Integer mqCount = 0;
-                Integer Acount = 0;
-                Integer Ecount = 0;
+                LocalDateTime now = LocalDateTime.now();
+                Long currentTime = System.currentTimeMillis();
+                HashMap<String, Integer> mapSurplusGeneral = new HashMap<>();
+                ArrayList<String> orderIdList = new ArrayList<>();
+                HashMap<String, Object> mapMongo = new HashMap<>();
+
                 for (OrderScriptDto item : dtoData) {
-                    count += 1;
                     LinkedList<String> sqls = new LinkedList<>();
                     if (item.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
-                        LocalDateTime now = LocalDateTime.now();
                         try {
-                            KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
-                            if (vo.getStatus() != 0) {
-                                continue;
-                            }
+//                            KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
+//                            if (vo.getStatus() != 0) {
+//                                continue;
+//                            }
 
                             //mysql
                             KylinOrderTickets orderTickets = new KylinOrderTickets();
@@ -1047,62 +1046,83 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             orderTicketStatus.setUpdatedAt(now);
 
                             //vo
-                            HashMap<String, Object> map = new HashMap<>();
-                            map.put("status", KylinTableStatusConst.ORDER_STATUS2);
-                            map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
-                            map.put("changeDate", now);
-                            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
-                                    Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
-                                    new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
-                            );
-
-                            LocalDateTime strTime = vo.getChangeDate();
-
-                            vo.setChangeDate(now);
-                            vo.setStatus(KylinTableStatusConst.ORDER_STATUS2);
-                            vo.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
-                            redisUtil.set(KylinRedisConst.ORDER + vo.getOrderTicketsId(), vo);
-
-                            map2.put(vo.getTicketId(), map2.get(vo.getTicketId()) == null ? vo.getNumber() : map2.get(vo.getTicketId()) + vo.getNumber());
-                            mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId(), vo);
-                            Acount += 1;
-
-                            List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList();
-                            for (int i = 0; i < entities.size(); i++) {
-                                KylinOrderTicketEntitiesVo items = entities.get(i);
-                                dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
-                            }
+                            mapMongo.put("status", KylinTableStatusConst.ORDER_STATUS2);
+                            mapMongo.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
+                            mapMongo.put("changeDate", now);
+                            orderIdList.add(orderTickets.getOrderTicketsId() + "," + item.getUserId());
+//                            mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+//                                    Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
+//                                    new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
+//                            );
+
+
+//                            vo.setChangeDate(now);
+//                            vo.setStatus(KylinTableStatusConst.ORDER_STATUS2);
+//                            vo.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
+//                            redisUtil.set(KylinRedisConst.ORDER + orderTickets.getOrderTicketsId(), vo);
+
+                            mapSurplusGeneral.put(item.getTicketId(), mapSurplusGeneral.get(item.getTicketId()) == null ? item.getNumber() : mapSurplusGeneral.get(item.getTicketId()) + item.getNumber());
+//                            mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId(), vo);
+
+//                            List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList();
+//                            for (int i = 0; i < entities.size(); i++) {
+//                                KylinOrderTicketEntitiesVo items = entities.get(i);
+//                                dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
+//                            }
 
                             sqls.add(SqlMapping.get("kylin_order_ticket.close"));
                             LinkedList<Object[]> sqlsDataA = new LinkedList<>();
-                            sqlsDataA.add(orderTickets.getCloseOrderObject(strTime, strTime));
+                            sqlsDataA.add(orderTickets.getCloseOrderObject());
 
                             sqls.add(SqlMapping.get("kylin_order_ticket_status.close"));
                             LinkedList<Object[]> sqlsDataB = new LinkedList<>();
-                            sqlsDataB.add(orderTicketStatus.getCloseOrderObject(strTime, strTime));
+                            sqlsDataB.add(orderTicketStatus.getCloseOrderObject());
 
                             sqls.add(SqlMapping.get("kylin_order_ticket_relation.close"));
                             LinkedList<Object[]> sqlsDataC = new LinkedList<>();
-                            sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
+                            sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId()});
 
                             rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
-                            mqCount += 1;
                         } catch (Exception e) {
                             log.debug("CHECK TIME SYNC = " + e.getMessage());
                             e.printStackTrace();
                             return false;
                         }
-                    }else{
-                        Ecount+=1;
+                    } else {
                     }
                 }
-                log.debug("COUNT 1 = " + count);
-                log.debug("COUNT 2 = " + mqCount);
-                log.debug("COUNT 3 = " + Acount);
-                log.debug("COUNT 4 = " + Ecount);
-                for (Map.Entry<String, Integer> entry : map2.entrySet()) {
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("FOR 循环 -> time:" + (currentTime) + "毫秒");
+
+
+                //库存
+                for (Map.Entry<String, Integer> entry : mapSurplusGeneral.entrySet()) {
                     dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());
                 }
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 库存 -> time:" + (currentTime) + "毫秒");
+                //mongo
+                mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                        Query.query(Criteria.where("orderTicketsId").in(orderIdList)).getQueryObject(),
+                        new BasicDBObject("$set", mongoConverter.convertToMongoType(mapMongo))
+                );
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("mongo -> time:" + (currentTime) + "毫秒");
+                //redis 列表
+                orderIdList.forEach(t -> {
+                    String orderTicketId = t.split(",")[0];
+                    String uid = t.split(",")[1];
+                    KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(orderTicketId);
+                    redisUtil.set(KylinRedisConst.ORDER + orderTicketId, vo);
+                    mongoVoUtils.resetOrderListVo(uid, 2, orderTicketId, vo);
+                    // redis 限购
+                    for (int i = 0; i < vo.getEntitiesVoList().size(); i++) {
+                        KylinOrderTicketEntitiesVo items = vo.getEntitiesVoList().get(i);
+                        dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
+                    }
+                });
+                currentTime = System.currentTimeMillis() - currentTime;
+                log.debug("redis 列表 限购 -> time:" + (currentTime) + "毫秒");
             } catch (Exception e) {
                 e.printStackTrace();
             } finally {

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

@@ -417,6 +417,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 return ResponseDto.success("保存成功");
             }
         } catch (Exception e) {
+            e.printStackTrace();
             return ResponseDto.failure(ErrorMapping.get(20115));
         }
     }

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

@@ -24,8 +24,8 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
 
 
 # ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
+kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ?
+kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ?