From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 2a7ed0f..29292f9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -172,9 +172,9 @@
doJDOrderJob();// 浜笢璁㈠崟澶勭悊
doPDDOrderJob();// 鎷煎澶氳鍗曞鐞�
doImportantTaoBaoGoodsUpdateJob();// 娣樺疂閲嶈鍟嗗搧鐨勪俊鎭洿鏂�
- doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
+ // doHongBaoRecieveIntegralGetJob();// 杩斿埄鍒拌处锛岄噾甯佸鍔�
// doPlaceOrderIntegralJob();// 涓嬪崟璧犻�侀噾甯佷换鍔�
- doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
+ // doDouYinDeviceActiveJob();// 鎶栭煶璁惧婵�娲诲箍鍛婄洃娴�
}
}
@@ -926,9 +926,9 @@
String key = its.next();
DouYinDeviceActiveQueueDTO active = map.get(key);
if (active.getType() == DouYinDeviceActiveQueueDTO.TYPE_AD) {// 鎶栭煶
- DouYinClickEvent event = douYinClickEventService.selectByAid(active.getAid());
+ DouYinClickEvent event = douYinClickEventService.selectByCallback(active.getCallback());
if (event != null) {
- if (event.getOs() == 0) {
+ if (event.getOs() == 0 && !StringUtil.isNullOrEmpty(event.getUuid())) {
DeviceActive deviceActive = deviceActiveService
.getFirstActiveInfoByImei(event.getUuid());
if (deviceActive != null) {
@@ -951,7 +951,7 @@
if (active.getPlatform() == 1) {
DeviceActive deviceActive = deviceActiveService
.getFirstActiveInfo(active.getDevice());
- if (deviceActive != null && deviceActive.getImei() != null) {
+ if (deviceActive != null && !StringUtil.isNullOrEmpty(deviceActive.getImei())) {
DouYinClickEvent event = douYinClickEventService
.selectByUuid(deviceActive.getImei());
if (event != null) {// 鍥炶皟
--
Gitblit v1.8.0