Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/PerformancesExpressServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
@@ -528,7 +529,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         return ResponseDto.success();
     }
 
-    //    @Async
+    @Async
     public void batchPlaceOrder(String performanceId) {
         int count;
         int limitNum = 10; // 因单个那边判断了如果数量不大于1如果有错误直接返回 所以这里必须大于1
@@ -551,7 +552,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
         } while (count >= limitNum);
     }
 
-    //    @Async
+    @Async
     public void batchCancelOrder(String performanceId) {
         int count;
         int limitNum = 10; // 因单个那边判断了如果数量不大于1如果有错误直接返回 所以这里必须大于1

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

@@ -315,16 +315,14 @@
         FROM kylin_order_tickets kot
         INNER join kylin_order_ticket_status kots ON kot.order_tickets_id = kots.order_id
         INNER join kylin_order_ticket_relations kotr ON kot.order_tickets_id = kotr.order_id
-        LEFT join kylin_order_express koe ON kot.order_tickets_id = koe.order_tickets_id
         <where>
             kotr.performance_id = #{performanceId}
             AND kot.get_ticket_type = 'express'
             AND kots.status IN (1, 6)
             AND kots.pay_status = 1
-            AND koe.express_status NOT IN (2) -- 申请成功的不可再申请 后面加状态可能需要改
             AND kot.mid > ${mid}
         </where>
-        GROUP BY kot.order_tickets_id
+        ORDER BY mid ASC
         LIMIT ${limitNum}
     </select>
 </mapper>