From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java |   12 +++++++++---
 1 files changed, 9 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 d645020..5bedb40 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
@@ -10,7 +10,7 @@
 import com.yeshi.fanli.entity.push.DeviceActive;
 import com.yeshi.fanli.service.inter.push.DeviceActiveService;
 import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
+import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
 
 @Service
 public class DeviceActiveServiceImpl implements DeviceActiveService {
@@ -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()));
 			}
@@ -58,6 +60,10 @@
 				updateDeviceActive.setDeviceToken(deviceActive.getDeviceToken());
 				updateDeviceActive.setDeviceTokenMd5(StringUtil.Md5(deviceActive.getDeviceToken()));
 			}
+
+			if (StringUtil.isNullOrEmpty(da.getMac()))
+				updateDeviceActive.setMac(deviceActive.getMac());
+
 			deviceActiveMapper.updateByPrimaryKeySelective(updateDeviceActive);
 		}
 

--
Gitblit v1.8.0