From 44327a748a3e6e04a21faa85e44c89e60a954f23 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 11:43:33 +0800
Subject: [PATCH] 活动通用券 取消验证
---
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