From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |   43 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
index ec07767..2476fe7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -18,6 +18,7 @@
 import org.yeshi.utils.tencentcloud.COSManager;
 import org.yeshi.utils.tencentcloud.entity.COSInitParams;
 
+import com.google.gson.Gson;
 import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;
 import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
 import com.yeshi.fanli.dto.mq.UidDateDTO;
@@ -149,6 +150,9 @@
 	@Resource
 	private TeamEincomeManager teamEincomeManager;
 
+//	@Resource
+//	private VipShopOrderService vipShopOrderService;
+
 	private static boolean isInited = false;
 
 	public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -173,7 +177,6 @@
 			doTaoBaoOrders();// 澶勭悊娣樺疂璁㈠崟
 			doTaoBaoNewOrders();// 澶勭悊娣樺疂璁㈠崟锛堝垰鍒氫骇鐢熺殑锛�
 			doOrderFanLiNew();// 鏂扮増杩斿埄
-
 			doOrderShareFanLi();
 			doWeiQuanOrder();// 澶勭悊缁存潈璁㈠崟
 			doPushIOS();// 澶勭悊鍙戦�両OS娑堟伅
@@ -182,6 +185,7 @@
 			doUpdateGoodsJob(); // 鏇存柊鍟嗗搧闃熷垪
 			doJDOrderJob();// 浜笢璁㈠崟澶勭悊
 			doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
+//			doVipShopOrderJob();// 鍞搧浼氳鍗曞鐞�
 			doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
 			doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
 			// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
@@ -192,6 +196,7 @@
 			doOrderTeamIncomeFanLi();
 			doDividentsJob();
 		}
+		
 	}
 
 	/**
@@ -398,7 +403,7 @@
 									TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(handler);
 								} catch (Exception e) {
 									try {
-										LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
+										LogHelper.errorDetailInfo(e,new Gson().toJson(map.get(handler)).toString(), "");
 									} catch (Exception e1) {
 										e1.printStackTrace();
 									}
@@ -707,6 +712,40 @@
 
 	}
 
+//	public void doVipShopOrderJob() {
+//		executor.execute(new Runnable() {
+//			@Override
+//			public void run() {
+//				while (true) {
+//					try {
+//						Map<String, String> map = VipShopOrderCMQManager.getInstance().consumeVipShopOrder(16);
+//						if (map != null) {
+//							Iterator<String> its = map.keySet().iterator();
+//							while (its.hasNext()) {
+//								String key = its.next();
+//								try {
+//									String orderId = map.get(key);
+//									if (!StringUtil.isNullOrEmpty(orderId)) {
+//										List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
+//										if (orderList != null)
+//											for (VipShopOrder order : orderList)
+//												orderProcessService.processVipShopOrder(order);
+//									}
+//									VipShopOrderCMQManager.getInstance().deleteVipShopOrder(key);
+//								} catch (Exception e) {
+//									LogHelper.errorDetailInfo(e);
+//								}
+//							}
+//						}
+//					} catch (Exception e) {
+//						LogHelper.error("鎷煎澶氳鍗�:" + e.getMessage());
+//					}
+//				}
+//			}
+//		});
+//
+//	}
+
 	/**
 	 * 閲嶈鐨勬窐瀹濆晢鍝佷俊鎭洿鏂�
 	 */

--
Gitblit v1.8.0