From f67743e47f57dafc7031af44e2037c03e680a60c Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 三月 2019 11:30:43 +0800
Subject: [PATCH] 清理无效引用
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 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 7fa0708..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,24 +1,22 @@
package com.yeshi.fanli.service.impl.push;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import javax.transaction.Transactional;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Service;
-import org.yeshi.utils.HttpUtil;
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;
@@ -26,8 +24,9 @@
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
-import com.yeshi.fanli.util.factory.IOSPushFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+
+import net.sf.json.JSONObject;
@Service
public class PushGoodsServiceImpl implements PushGoodsService {
@@ -97,7 +96,7 @@
} else {
// 淇敼
record.setUpdateTime(new Date());
- pushGoodsMapper.insertSelective(record);
+ pushGoodsMapper.updateByPrimaryKeySelective(record);
}
// 澶勭悊鍟嗗搧淇℃伅
@@ -125,7 +124,7 @@
if (commonGoods != null) {
commonGoodsService.addOrUpdateCommonGoods(commonGoods);
Long cid = commonGoods.getId();
- if (cid == null) {
+ if (cid != null) {
listCommonId.add(cid);
}
}
@@ -171,21 +170,23 @@
pushGoodsGroup.setCommonGoods(new CommonGoods(cid));
listAdd.add(pushGoodsGroup);
}
+
+ pushGoodsGroupService.insertBatch(listAdd);
}
-
+
}
@Override
@Transactional
public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {
- List<PushGoods> lisState = pushGoodsMapper.listByPushState(list);
+ /*List<PushGoods> lisState = pushGoodsMapper.listByPushState(list);
if (lisState != null && lisState.size() > 0) {
for (PushGoods pushGoods : lisState) {
// 宸叉帹閫佺殑娑堟伅涓嶈兘鍒犻櫎
list.remove(pushGoods.getId());
}
- }
+ }*/
// 鍒犻櫎瀵瑰簲鍟嗗搧
pushGoodsGroupService.deleteBatchByPushId(list);
@@ -204,13 +205,13 @@
}
@Override
- public List<PushGoods> listHistoryByPushTime(long start, int count, Date pushTime) {
- return pushGoodsMapper.listHistoryByPushTime(start, count, pushTime);
+ public List<PushGoods> listHistoryByPushTime(long start, int count, Long uid, Date pushTime) {
+ return pushGoodsMapper.listHistoryByPushTime(start, count, uid, pushTime);
}
@Override
- public long countHistoryByPushTime(Date pushTime) {
- return pushGoodsMapper.countHistoryByPushTime(pushTime);
+ public long countHistoryByPushTime(Long uid, Date pushTime) {
+ return pushGoodsMapper.countHistoryByPushTime(uid, pushTime);
}
@Override
@@ -231,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);
@@ -241,15 +268,10 @@
}
Long goodsId = commonGoods.getGoodsId();
- JSONObject json = IOSPushFactory.createGoodsPush(goodsId, alertTitle, alertContent);
- if (json.toString().getBytes().length > 256) {
- throw new PushException(1, "鏍囬鎴栧唴瀹硅繃闀�,璇峰垹鍑忓悗鍐嶈瘯");
- }
-
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");
@@ -259,12 +281,7 @@
// 鐢熸垚閾炬帴
url = url + "?id=" + id;
- JSONObject json = IOSPushFactory.createURLPush(HttpUtil.getShortLink(url), alertTitle, alertContent);
- if (json.toString().getBytes().length > 256) {
- throw new PushException(1, "鏍囬鎴栧唴瀹硅繃闀�,璇峰垹鍑忓悗鍐嶈瘯");
- }
-
- pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent);
+ pushService.pushUrl(pushGoods.getUid(), url, alertTitle, alertContent, listIOS, listAndroid);
}
// 宸叉帹閫�
@@ -275,7 +292,6 @@
pushGoods.setUpdateTime(new Date());
updateByPrimaryKeySelective(pushGoods);
-
}
}
--
Gitblit v1.8.0