From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index fc0ede5..3baac5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.push;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -10,12 +11,12 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
-import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
@@ -24,6 +25,8 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+
+import net.sf.json.JSONObject;
@Service
public class PushGoodsServiceImpl implements PushGoodsService {
@@ -229,7 +232,33 @@
if (goodsList == null || goodsList.size() == 0) {
throw new PushException(1, "鎺ㄩ�佹棤鍟嗗搧,璇峰畬鍠勬暟鎹�");
}
-
+
+ String versions = pushGoods.getVersions();
+ if (versions == null || versions.trim().length() == 0) {
+ throw new PushException(1, "鎺ㄩ�佺増鏈笉鑳戒负绌�");
+ }
+
+ List<String> listIOS = new ArrayList<String>();
+ JSONObject json = JSONObject.fromObject(versions);
+ String versionsIOS = json.getString("IOS");
+ if (versionsIOS != null && versionsIOS.trim().length() > 0) {
+ if (versionsIOS.contains("鍏ㄦ帹")) {
+ listIOS = null;
+ } else {
+ listIOS = Arrays.asList(versionsIOS.split(","));
+ }
+ }
+
+ List<String> listAndroid = new ArrayList<String>();
+ String versionsAndroid = json.getString("Android");
+ if (versionsAndroid != null && versionsAndroid.trim().length() > 0) {
+ if (versionsAndroid.contains("鍏ㄦ帹")) {
+ listAndroid = null;
+ } else {
+ listAndroid = Arrays.asList(versionsAndroid.split(","));
+ }
+ }
+
if (goodsList.size() == 1) {
/* 鍗曚釜鍟嗗搧鎺ㄩ�侊細 鐩存帴澶勭悊涓哄晢鍝佷俊鎭� */
PushGoodsGroup pushGoodsGroup = goodsList.get(0);
@@ -240,9 +269,9 @@
Long goodsId = commonGoods.getGoodsId();
String url = "https://item.taobao.com/item.htm?id=" + goodsId;
+
+ pushService.pushGoods(pushGoods.getUid(), url, alertTitle, alertContent, listIOS, listAndroid);
- pushService.pushGoods(pushGoods.getUid(), url, alertTitle, alertContent);
-
} else {
/* 澶氫釜鍟嗗搧鎺ㄩ�� */
String url = configService.get("push_goods_details");
@@ -252,7 +281,7 @@
// 鐢熸垚閾炬帴
url = url + "?id=" + id;
- pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent);
+ pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent, listIOS, listAndroid);
}
// 宸叉帹閫�
@@ -263,7 +292,6 @@
pushGoods.setUpdateTime(new Date());
updateByPrimaryKeySelective(pushGoods);
-
}
}
--
Gitblit v1.8.0