fanli-server.git

			@@ -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;
			@@ -37,6 +38,7 @@
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
			import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
			import com.yeshi.fanli.exception.order.dividents.TeamDividentsRecordException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
			import com.yeshi.fanli.service.inter.lable.BoutiqueAutoRuleService;
			@@ -148,6 +150,9 @@
			@Resource
			private TeamEincomeManager teamEincomeManager;

			// @Resource
			// private VipShopOrderService vipShopOrderService;

			private static boolean isInited = false;

			public void onApplicationEvent(ContextRefreshedEvent arg0) {
			@@ -172,7 +177,6 @@
			doTaoBaoOrders();// 处理淘宝订单
			doTaoBaoNewOrders();// 处理淘宝订单（刚刚产生的）
			doOrderFanLiNew();// 新版返利

			doOrderShareFanLi();
			doWeiQuanOrder();// 处理维权订单
			doPushIOS();// 处理发送IOS消息
			@@ -181,6 +185,7 @@
			doUpdateGoodsJob(); // 更新商品队列
			doJDOrderJob();// 京东订单处理
			doPDDOrderJob();// 拼多多订单处理
			// doVipShopOrderJob();// 唯品会订单处理
			doImportantTaoBaoGoodsUpdateJob();// 淘宝重要商品的信息更新
			doHongBaoRecieveIntegralGetJob();// 返利到账，金币增加
			// doPlaceOrderIntegralJob();// 下单赠送金币任务
			@@ -191,6 +196,7 @@
			doOrderTeamIncomeFanLi();
			doDividentsJob();
			}

			}

			/**
			@@ -397,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();
			}
			@@ -705,6 +711,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());
			// }
			// }
			// }
			// });
			//
			// }

			/**
			* 重要的淘宝商品信息更新
			@@ -1162,7 +1202,19 @@
			try {
			teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDate());
			TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
			} catch (Exception e) {
			} catch (TeamDividentsRecordException e1) {
			if (e1.getCode() == TeamDividentsRecordException.CODE_EXIST) {
			TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
			} else {
			try {
			LogHelper.errorDetailInfo(e1);
			} catch (Exception e2) {
			e2.printStackTrace();
			}
			}
			}

			catch (Exception e) {
			try {
			LogHelper.errorDetailInfo(e);
			} catch (Exception e1) {