From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 17868de..95b664e 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
@@ -38,8 +38,10 @@
 				deviceActive.getPlatform());
 		if (da == null) {
 			deviceActive.setId(null);
-			deviceActive.setUpdateTime(new Date());
-			deviceActive.setCreateTime(new Date());
+			if (deviceActive.getUpdateTime() == null)
+				deviceActive.setUpdateTime(new Date());
+			if (deviceActive.getCreateTime() == null)
+				deviceActive.setCreateTime(new Date());
 			if (!StringUtil.isNullOrEmpty(deviceActive.getDeviceToken())) {
 				deviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
 			}
@@ -60,7 +62,7 @@
 			}
 
 			if (StringUtil.isNullOrEmpty(da.getMac()))
-				updateDeviceActive.setImei(deviceActive.getMac());
+				updateDeviceActive.setMac(deviceActive.getMac());
 
 			deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
 		}

--
Gitblit v1.8.0