From 33a69c65e1f6701bd29ef74d0681dbbe9a21cea7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jan 2021 11:19:08 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new
---
src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
index 2428c7b..3609764 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -1,6 +1,11 @@
package com.xcong.excoin.rabbit.pricequeue;
import com.alibaba.fastjson.JSONObject;
+import com.xcong.excoin.common.contants.AppContants;
+import com.xcong.excoin.rabbit.pricequeue.whole.WholeDataQueue;
+import com.xcong.excoin.rabbit.pricequeue.whole.WholePriceDataModel;
+import com.xcong.excoin.utils.RedisUtils;
+import com.xcong.excoin.utils.SpringContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -60,12 +65,12 @@
// 判断这个单的这个类型是否有
// if (CollectionUtils.isNotEmpty(list)) {
// 新增
- OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo());
+ OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId());
list.add(orderModel);
// }
} else {
List<OrderModel> list = new ArrayList<OrderModel>();
- OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo());
+ OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId());
list.add(orderModel);
orderMap.put(price, list);
}
@@ -95,12 +100,12 @@
// 判断这个单的这个类型是否有
// if (CollectionUtils.isNotEmpty(list)) {
// 新增
- OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo());
+ OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId());
list.add(orderModel);
// }
} else {
List<OrderModel> list = new ArrayList<OrderModel>();
- OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo());
+ OrderModel orderModel = new OrderModel(orderId, type, price, null,order.getOperateNo(), order.getMemberId());
list.add(orderModel);
orderMap.put(price, list);
}
@@ -129,4 +134,19 @@
}
}
+ public static void wholePriceDataOperation(WholePriceDataModel wholePriceData) {
+ RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
+
+ Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
+
+ WholePriceDataModel isExistData = dataModelMap.get(wholePriceData.getMemberId().toString());
+ if (isExistData != null) {
+ dataModelMap.remove(wholePriceData.getMemberId().toString());
+ }
+
+ dataModelMap.put(wholePriceData.getMemberId().toString(), wholePriceData);
+
+ redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+ }
+
}
--
Gitblit v1.9.1