库存回滚逻辑

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -269,7 +269,7 @@
         number,
         user_id,
         oc.coupon_code,
-        oc.coupon_tpye
+        oc.coupon_type
         from (SELECT ot.mid,
         order_tickets_id,
         order_code,
@@ -280,7 +280,7 @@
         FROM kylin_order_tickets AS ot
         inner JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         inner JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
-        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE)) as s
+        WHERE status = 0) as s
         left JOIN kylin_order_coupons AS oc ON oc.order_id = s.order_tickets_id
         <if test="userId!=''">
             AND user_id = #{userId}

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

@@ -529,12 +529,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         int status = getStatus;
         if (null != ticketItem) {
             // 判断售罄
-            boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
-            if (isSellOut) {
-                getStatus = 8;
-                status = 8;
-            }
-            if (6 == getStatus || 9 == getStatus || 10 == getStatus) {
+            if (6 == getStatus || 8 == getStatus || 9 == getStatus || 10 == getStatus) {
                 String timeStart = ticketItem.getTimeStart();
                 String timeEnd = ticketItem.getTimeEnd();
                 String nowTime = DateUtil.getNowTime();
@@ -548,6 +543,11 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                     }
                 }
             }
+
+            boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
+            if (isSellOut) {
+                status = 8;
+            }
         }
         return status;
     }

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

@@ -87,13 +87,13 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
                         orderIdList.add(item.getOrderTicketsId());
                         mapSurplusGeneral.put(item.getTicketId(), mapSurplusGeneral.get(item.getTicketId()) == null ? item.getNumber() : mapSurplusGeneral.get(item.getTicketId()) + item.getNumber());
                     }
-
-                    if (item.getCouponType() != 101) {
-                        couponDataList.add(item.getCouponCode() + "," + item.getUserId());
-                        couponIdList.add(item.getCouponCode());
+                    if (item.getCouponType() != null) {
+                        if (item.getCouponType() != 101) {
+                            couponDataList.add(item.getCouponCode() + "," + item.getUserId());
+                            couponIdList.add(item.getCouponCode());
+                        }
                     }
                 } catch (Exception e) {
-                    log.debug("CHECK TIME SYNC = " + e.getMessage());
                     e.printStackTrace();
                     return false;
                 }
@@ -101,7 +101,6 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
             }
         }
         currentTime = System.currentTimeMillis() - currentTime;
-        log.debug("FOR 循环 -> time:" + (currentTime) + "毫秒");
 
         if (orderDataList.size() > 0) {
             //mysql
@@ -152,11 +151,11 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
                         break;
                     }
                 }
-                log.debug("MQLIST SIZE  = " + mqList.size());
                 queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_CLOSE.getKey(), OrderCloseMapping.get(mqList));
             }
-
-            platformCandyUserCouponService.useBackCoupon(couponDataList, couponIdList);
+            if (couponIdList.size() > 0) {
+                platformCandyUserCouponService.useBackCoupon(couponDataList, couponIdList);
+            }
         }
         return true;
     }