From c54fb6a88876be994906d57d2d18e844686964d0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:16:13 +0800
Subject: [PATCH] rcoketmq集中管理

---
 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 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 edeabbb..957dd17 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -67,15 +67,15 @@
 import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
 import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
 import com.yeshi.fanli.util.ad.DouYinAdUtil;
-import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
-import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
-import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
-import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.SuningOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
-import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
+import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
+import com.yeshi.fanli.util.mq.cmq.UserMoneyChangeCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.PlaceOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
+import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 /**
@@ -203,7 +203,7 @@
 			doOrderTeamIncomePreFanLi();// 澶勭悊璁㈠崟鎻愭垚杩斿埄
 			doDividentsPreJob();
 
-			doOrderTeamIncomeFanLi();
+			doOrderTeamRewardFanLi();
 			doDividentsJob();
 		}
 		
@@ -429,9 +429,9 @@
 	}
 
 	/**
-	 * 澶勭悊鍥㈤槦璁㈠崟杩斿埄
+	 * 澶勭悊鍥㈤槦濂栭噾杩斿埄
 	 */
-	public void doOrderTeamIncomeFanLi() {
+	public void doOrderTeamRewardFanLi() {
 		executor.execute(new Runnable() {
 			@Override
 			public void run() {
@@ -444,7 +444,7 @@
 								String handler = its.next();
 								try {
 									UidDateDTO dto = map.get(handler);
-									teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
+									teamEincomeManager.addTeamRewardTOUserAccount(dto.getDate(), dto.getUid());
 									TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
 								} catch (Exception e) {
 									try {
@@ -735,8 +735,9 @@
 								String key = its.next();
 								try {
 									String orderId = map.get(key);
+									LogHelper.test("鍞搧浼氳鍗曟秷璐�:"+orderId);
 									if (!StringUtil.isNullOrEmpty(orderId)) {
-										List<VipShopOrder> orderList = vipShopOrderService.listByOrderSn(orderId);
+										List<VipShopOrder> orderList = vipShopOrderService.listDetailByOrderSn(orderId);
 										if (orderList != null)
 											for (VipShopOrder order : orderList)
 												orderProcessService.processVipShopOrder(order);
@@ -748,7 +749,7 @@
 							}
 						}
 					} catch (Exception e) {
-						LogHelper.error("鍞搧浼氳鍗�:" + e.getMessage());
+						LogHelper.errorDetailInfo(e);
 					}
 				}
 			}
@@ -783,7 +784,7 @@
 							}
 						}
 					} catch (Exception e) {
-						LogHelper.error("鑻忓畞璁㈠崟:" + e.getMessage());
+						LogHelper.errorDetailInfo(e);
 					}
 				}
 			}

--
Gitblit v1.8.0