From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图,添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
index 03ad73c..2f90f03 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/IOSPushServiceImpl.java
@@ -265,7 +265,7 @@
 			return;
 
 		// 鍒ゆ柇device鏄惁瀛樺湪
-		DeviceTokenIOS deviceTokenIos = deviceTokenIOSMapper.selectByDevice(device);
+		DeviceTokenIOS deviceTokenIos = deviceTokenIOSMapper.selectByDeviceForUpdate(device);
 		if (deviceTokenIos == null) {
 			deviceTokenIos = new DeviceTokenIOS();
 			deviceTokenIos.setCreateTime(new Date());
@@ -326,7 +326,7 @@
 	 * 
 	 * @param json
 	 */
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void addPushIOSQueue(MessageInfo info, String url, int type, String versionCodes) throws PushException {
 
 		if (Constant.IS_TEST)
@@ -483,11 +483,13 @@
 
 		Calendar now = Calendar.getInstance();
 		int hour = now.get(Calendar.HOUR_OF_DAY);
-		if (hour >= 8 && hour < 20) {
-			ispush = true; // 鍙帹閫�
-		} else {
-			listNotPushId = validateNotDisturb();
-		}
+//		if (hour >= 8 && hour < 20) {
+//			ispush = true; // 鍙帹閫�
+//		} else {
+//			listNotPushId = validateNotDisturb();
+//		}
+		
+		ispush=true;//TODO 澶勭悊娑堟伅鍏嶆墦鎵�
 
 		for (DeviceTokenIOS ios : list) {
 

--
Gitblit v1.8.0