Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -5,10 +5,14 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 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;
@@ -94,6 +98,38 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.TICKET + ticketId);
     }
 
+    public void setOrderList(String userId, List<KylinOrderListVo> vo) {
+        redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+    }
+
+    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))
+                            .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);
+    }
+
+    /**
+     * 根据订单id 获取 订单vo 详情
+     *
+     * @param orderId
+     * @return
+     */
+    public KylinOrderTicketVo getOrderTicketVo(String orderId) {
+        if (redisUtil.hasKey(KylinRedisConst.ORDER + orderId)) {
+        } else {
+            KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+            List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
+            ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
+            redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
+        }
+        return (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
+    }
+
     /**
      * 删除订单redis
      *

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -6,9 +6,12 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -147,4 +150,60 @@ public class MongoVoUtils {
             return null;
         }
     }
+
+    /**
+     * @param userId  用户id
+     * @param type    1新增 2修改
+     * @param orderId 订单id [需要新增或者修改的订单id]
+     */
+    public Boolean resetOrderListVo(String userId, Integer type, String orderId) {
+        List<KylinOrderListVo> vo = new ArrayList<>();
+        List<KylinOrderListVo> redisVo = new ArrayList();
+        KylinOrderListVo voItem = new KylinOrderListVo();
+
+        KylinOrderTicketVo data = dataUtils.getOrderTicketVo(orderId);
+        BeanUtils.copyProperties(data, voItem);
+        redisVo.add(voItem);
+        List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
+        if (redisData.size() > 0) {
+            if (redisData.get(0).getOrderTicketsId().equals(orderId)) {
+                redisData.remove(0);
+            }
+        }
+        redisVo.addAll(redisData);
+
+        switch (type) {
+            case 1:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (i == 0) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i - 1));
+                    }
+                }
+                if (redisVo.size() == 0) {
+                    vo.add(voItem);
+                }
+                dataUtils.setOrderList(userId, vo);
+                return true;
+            case 2:
+                for (int i = 0; i < redisVo.size(); i++) {
+                    if (i == 40) {
+                        break;
+                    }
+                    if (redisVo.get(i).getOrderTicketsId().equals(orderId)) {
+                        vo.add(voItem);
+                    } else {
+                        vo.add(redisVo.get(i));
+                    }
+                }
+                dataUtils.setOrderList(userId, vo);
+                return true;
+            default:
+                return false;
+        }
+    }
 }

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test.yml

+liquidnet:
+  info:
+    port: 8190
+    context: /service-executor-main
+    name: liquidnet-service-executor-main
+  logfile:
+    path: ./logs
+    name: service-executor-main
+  xxl:
+    accessToken: qk52rqSejRBm9enf6BTTxw==
+    admin:
+      # Job执行器注册地址，多个地址则用逗号分隔
+#      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
+      addresses: ${liquidnet.service.executor-main.xxl.admin.addresses}
+    executor:
+      # Job执行器IP，默认为空表示自动获取IP，多网卡时手动指定
+      ip:
+      # Job执行器端口，单机多个执行器端口号不能相同
+      port: 8191
+      # Job执行器心跳注册分组依据，按需配置
+      appname: liquidnet-service-executor
+      # Job执行器运行日志，注意目录读写权限
+      logpath: ./logs/job

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

@@ -155,7 +155,7 @@ public class DataUtils {
         return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
-    public void setOrderTicketVo(String userId, List<KylinOrderListVo> vo) {
+    public void setOrderList(String userId, List<KylinOrderListVo> vo) {
         redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
     }
 

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

@@ -184,13 +184,13 @@ public class MongoVoUtils {
                     if (i == 0) {
                         vo.add(voItem);
                     } else {
-                        vo.add(redisVo.get(i - 1));
+                        vo.add(redisVo.get(i));
                     }
                 }
                 if (redisVo.size() == 0) {
                     vo.add(voItem);
                 }
-                dataUtils.setOrderTicketVo(userId, vo);
+                dataUtils.setOrderList(userId, vo);
                 return true;
             case 2:
                 for (int i = 0; i < redisVo.size(); i++) {
@@ -203,7 +203,7 @@ public class MongoVoUtils {
                         vo.add(redisVo.get(i));
                     }
                 }
-                dataUtils.setOrderTicketVo(userId, vo);
+                dataUtils.setOrderList(userId, vo);
                 return true;
             default:
                 return false;