Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -47,7 +47,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param performanceAdminListParam 列表搜索参数
      * @return 分页 sql 数据
      */
-    PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
+    List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam);
 
     /**
      * 根据巡演id 查询演出列表 简易

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -59,8 +59,8 @@ public class KylinPerformancesController extends BaseController {
     @ResponseBody
     public TableDataInfo list(PerformanceAdminListParam performanceAdminListParam) {
         startPage();/**/
-        PageInfo<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
-        return getDataTable(result.getList());
+        List<PerformanceAdminListDao> result = kylinPerformancesService.getList(performanceAdminListParam);
+        return getDataTable(result);
     }
 
     @RequiresPermissions("kylin:performances:detail")

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

@@ -201,22 +201,19 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public PageInfo<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
-        PageInfo<PerformanceAdminListDao> pageInfoTmp = null;
-        try {
-            PageHelper.startPage(performanceAdminListParam.getPageNum(), performanceAdminListParam.getPageSize());
+    public List<PerformanceAdminListDao> getList(PerformanceAdminListParam performanceAdminListParam) {
         List<PerformanceAdminListDao> newList = new ArrayList();
+        try {
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(BeanUtil.convertBeanToMap(performanceAdminListParam));
             for (PerformanceAdminListDao item : voList) {
                 item.setStatus(item.getStatus());
                 newList.add(item);
             }
-            pageInfoTmp = new PageInfo(newList);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
         }
-        return pageInfoTmp;
+        return newList;
     }
 
     @Override

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderScriptDto.java

+package com.liquidnet.service.kylin.dao;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @class: PerformanceOrderListDao
+ * @Package com.liquidnet.service.kylin.dao
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/6/4 13:31
+ */
+@Data
+public class OrderScriptDto {
+    Integer mid;
+    String orderTicketsId;
+    String orderCode;
+    Integer status;
+    String ticketId;
+    Integer number;
+}

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
+import com.liquidnet.service.kylin.dao.OrderScriptDto;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import org.apache.ibatis.annotations.Param;
@@ -32,4 +33,6 @@ public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
     List<OrderTicketsListDao> orderList(Map<String, Object> map);
 
     List<OrderPushDamaiDto> pushDamaiDetailsList(String ticketsId);
+
+    List<OrderScriptDto> orderScriptDto(String userId);
 }

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

@@ -41,6 +41,16 @@
         <result column="get_ticket_type" property="getTicketType"/>
     </resultMap>
 
+    <resultMap id="orderScriptDtoResult" type="com.liquidnet.service.kylin.dao.OrderScriptDto">
+        <result column="mid" property="mid"/>
+        <result column="order_tickets_id" property="orderTicketsId"/>
+        <result column="order_code" property="orderCode"/>
+        <result column="status" property="status"/>
+        <result column="ticket_id" property="ticketId"/>
+        <result column="number" property="number"/>
+    </resultMap>
+
+
     <select id="getPriceNum" resultType="java.util.HashMap">
         SELECT SUM(o.price_actual) as total_price, SUM(o.number) as total_num
         FROM kylin_order_tickets AS o
@@ -182,4 +192,21 @@
           AND ote.sys_damai = 1
           AND ote.ticket_id = ${ticketsId}
     </select>
+
+    <select id="orderScriptDto" parameterType="java.lang.String" resultMap="orderScriptDtoResult">
+        SELECT ot.mid,
+        order_tickets_id,
+        order_code,
+        status,
+        ticket_id,
+        number
+        FROM kylin_order_tickets AS ot
+        LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
+        LEFT 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 MINUTE)
+        <if test="userId!=''">
+            AND user_id = #{userId}
+        </if>
+
+    </select>
 </mapper>

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

@@ -92,6 +92,6 @@ public class KylinOrderTicketsController {
     @ApiOperation("订单过期脚本")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<Boolean> checkOrderTime() {
-        return ResponseDto.success(orderTicketsService.checkOrderTime(null));
+        return ResponseDto.success(orderTicketsService.checkOrderTime(""));
     }
 }

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

 package com.liquidnet.service.kylin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
@@ -12,6 +13,7 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dao.OrderScriptDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
@@ -90,6 +92,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     private FeignAdamBaseClient feignAdamBaseClient;
     @Autowired
     private TaobaoTicketUtils taobaoTicketUtils;
+    @Autowired
+    private KylinOrderTicketsMapper orderTicketsMapper;
 
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
@@ -741,22 +745,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         PageInfo<List<KylinOrderListVo>> mPageInfo = null;
         String uid = CurrentUtil.getCurrentUid();
         checkOrderTime(uid);
-        page -= 1;
         try {
-            // 排序 分页
-//            Pageable pageable = PageRequest.of(page - 1, size, Sort.by(Sort.Direction.DESC, "orderTicketsId"));
-
-            //条件
-            Query query = new Query();
-            query.addCriteria(
-                    Criteria.where("userId").is(uid)
-//                    .and("status").ne(-1)
-            );
-            query.fields().include("orderTicketsId");
-            // 查询总数
-//            long count = mongoTemplate.count(query, KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
-//            query.with(pageable);
-
             List<KylinOrderListVo> voList = dataUtils.getOrderList(uid);
             for (int i = 0; i < voList.size(); i++) {
                 KylinOrderListVo item = voList.get(i);
@@ -847,21 +836,25 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
     @Override
     public boolean checkOrderTime(String userId) {
-        Query query = new Query();
-        query.addCriteria(Criteria.where("status").is(KylinTableStatusConst.ORDER_STATUS0).and("overdueAt").lte(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
-        if (null != userId) {
-            query.addCriteria(Criteria.where("userId").is(userId));
-        }
-        List<KylinOrderTicketVo> orderTicketVo = mongoTemplate.find(query,
-                KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
-
-        for (KylinOrderTicketVo item : orderTicketVo) {
-            if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 240, 240)) {
+//        Query query = new Query();
+//        query.addCriteria(Criteria.where("status").is(KylinTableStatusConst.ORDER_STATUS0).and("overdueAt").lte(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))));
+//        if (null != userId) {
+//            query.addCriteria(Criteria.where("userId").is(userId));
+//        }
+//        List<KylinOrderTicketVo> orderTicketVo = mongoTemplate.find(query,
+//                KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+//        UpdateWrapper updateWrapper = new UpdateWrapper<KylinOrderTickets>();//.eq("userId",userId);
+//        updateWrapper.eq("userId",userId);
+        List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
+
+
+        for (OrderScriptDto item : dtoData) {
+            if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 30, 240)) {
                 continue;
             }
             RLock lock = redisLockUtil.lock("order_lock:" + item.getOrderCode(), 240);
-            KylinOrderTicketVo itemData = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
-            if (itemData.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
+//            KylinOrderTicketVo itemData = dataUtils.getOrderTicketVo(item.getOrderTicketsId());
+            if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                 LocalDateTime now = LocalDateTime.now();
                 try {
                     //mysql
@@ -883,9 +876,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
                     );
                     dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
-
-                    dataUtils.changeSurplusGeneral(itemData.getTicketId(), itemData.getNumber());
-
+                    dataUtils.changeSurplusGeneral(item.getTicketId(), item.getNumber());
 
                     rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                             SqlMapping.get("kylin_order_ticket.close", orderTickets.getCloseOrderObject()));

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

@@ -9,7 +9,9 @@ import com.liquidnet.service.kylin.dto.vo.mongo.*;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import io.lettuce.core.GeoArgs;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -132,7 +134,9 @@ public class DataUtils {
     public List<KylinOrderListVo> getOrderList(String userId) {
         if (redisUtil.hasKey(KylinRedisConst.ORDER_LIST + userId)) {
         } else {
-            List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId)).limit(40), KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
+                    .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
+                    KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
         }
         return (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);