From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改，拼多多初步增加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 81 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 51 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
index 33ed1b2..1225be7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java
@@ -6,9 +6,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,17 +14,16 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.DeviceActive;
-import com.yeshi.fanli.entity.push.DeviceTokenIOS;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.push.PushGoodsRecord;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.exception.push.PushGoodsGroupException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.IOSPushService;
@@ -40,12 +36,15 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.JumpDetailParamsFactory;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
@Controller
@RequestMapping(value = "api/v1/push")
public class PushController {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private PushRecordService pushRecordService;
@@ -58,31 +57,31 @@
@Resource
private DeviceActiveService deviceActiveService;
-
+
@Resource
private PushService pushService;
-
+
@Resource
private PushGoodsService PushGoodsService;
-
+
@Resource
private PushGoodsGroupService pushGoodsGroupService;
-
+
@Resource
private PushGoodsRecordService pushGoodsRecordService;
-
+
@Resource
private JumpDetailV2Service jumpDetailV2Service;
-
+
@Resource
private ConfigService configService;
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
@RequestMapping(value = "callback", method = RequestMethod.POST)
public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绯荤粺"));
return;
@@ -111,16 +110,10 @@
da.setDeviceToken(deviceToken);
da.setPlatform(DeviceActive.PLATFORM_IOS);
da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ da.setDevice(acceptData.getDevice());
deviceActiveService.addDeviceActive(da);
-
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS == null)
- iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
- acceptData.getDevice());
- else {
- deviceTokenIOS.setDevice(acceptData.getDevice());
- iosPushService.updateDeviceToken(deviceTokenIOS);
- }
+ iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken,
+ acceptData.getDevice());
out.print(JsonUtil.loadTrue(0, null, "鎴愬姛"));
}
}
@@ -141,19 +134,11 @@
da.setDeviceToken(deviceToken);
da.setPlatform(DeviceActive.PLATFORM_IOS);
da.setVersionCode(Integer.parseInt(acceptData.getVersion()));
+ da.setDevice(acceptData.getDevice());
deviceActiveService.addDeviceActive(da);
// 娣诲姞token
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS != null) {
- deviceTokenIOS.setUid(uid);
- deviceTokenIOS.setDevice(acceptData.getDevice());
- deviceTokenIOS.setVersion(Integer.parseInt(acceptData.getVersion()));
- iosPushService.updateDeviceToken(deviceTokenIOS);
- } else {
- iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken,
- acceptData.getDevice());
- }
- out.print(JsonUtil.loadTrueResult(""));
+ iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken,
+ acceptData.getDevice());
}
}
@@ -165,12 +150,8 @@
*/
@RequestMapping(value = "/unBind", method = RequestMethod.POST)
public void unBind(AcceptData acceptData, String deviceToken, PrintWriter out) {
- if (!StringUtil.isNullOrEmpty(deviceToken)) {
- DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken);
- if (deviceTokenIOS != null) {
- deviceTokenIOS.setUid(null);
- iosPushService.updateDeviceToken(deviceTokenIOS);
- }
+ if (!StringUtil.isNullOrEmpty(acceptData.getDevice())) {
+ iosPushService.unBindUidAndDevice(acceptData.getDevice());
out.print(JsonUtil.loadTrue(0, null, "瑙ｇ粦鎴愬姛"));
}
}
@@ -202,10 +183,9 @@
deviceTokenHWService.unBindDeviceToken(acceptData.getDevice());
out.print(JsonUtil.loadTrueResult("鎴愬姛"));
}
-
-
+
/**
- * 瑙ｇ粦鎺ㄩ��
+ * 鍟嗗搧鎺ㄩ�佽褰�
*
* @param acceptData
* @param out
@@ -272,16 +252,15 @@
String fontColor1 = "#666666";
String fontColor2 = "#E5005C";
JSONArray array = new JSONArray();
-
JSONObject contentJson1 = new JSONObject();
contentJson1.put("color", fontColor1);
contentJson1.put("content", "鏈鎺ㄨ崘鍏�");
-
+
JSONObject contentJson2 = new JSONObject();
contentJson2.put("color", fontColor2);
contentJson2.put("content", totalgoods);
-
+
JSONObject contentJson3 = new JSONObject();
contentJson3.put("color", fontColor1);
contentJson3.put("content", "涓晢鍝�");
@@ -339,8 +318,8 @@
Long deviceId = deviceActive.getId();
for (PushGoods pushGoods : listPush) {
- List<PushGoodsRecord> listRecord = pushGoodsRecordService.listByPushIdAndDeviceId(
- pushGoods.getId(), deviceId);
+ List<PushGoodsRecord> listRecord = pushGoodsRecordService
+ .listByPushIdAndDeviceId(pushGoods.getId(), deviceId);
if (listRecord != null && listRecord.size() > 0) {
continue; // 宸茶璁板綍
}
@@ -361,5 +340,5 @@
});
}
}
-
+
}
--
Gitblit v1.8.0