From cd0c6d0c7b3f1348bbef2762c3909f5ff4a90efb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 29 九月 2019 15:44:26 +0800
Subject: [PATCH] 淘宝价，天猫价，分享模板修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
index a331254..c2c67cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
@@ -52,10 +52,16 @@
updateDeviceActive.setId(da.getId());
updateDeviceActive.setUpdateTime(new Date());
updateDeviceActive.setVersionCode(deviceActive.getVersionCode());
+ if (StringUtil.isNullOrEmpty(da.getImei()))
+ updateDeviceActive.setImei(deviceActive.getImei());
if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
}
+
+ if (StringUtil.isNullOrEmpty(da.getMac()))
+ updateDeviceActive.setMac(deviceActive.getMac());
+
deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
}
@@ -91,4 +97,9 @@
return deviceActiveMapper.selectFirst(device);
}
+ @Override
+ public DeviceActive getFirstActiveInfoByImei(String imei) {
+ return deviceActiveMapper.selectFirstByImei(imei);
+ }
+
}
--
Gitblit v1.8.0