From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 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..c63fe75 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
@@ -7,18 +7,15 @@
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,7 +23,6 @@
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;
@Service
@@ -97,7 +93,7 @@
} else {
// 淇敼
record.setUpdateTime(new Date());
- pushGoodsMapper.insertSelective(record);
+ pushGoodsMapper.updateByPrimaryKeySelective(record);
}
// 澶勭悊鍟嗗搧淇℃伅
@@ -125,7 +121,7 @@
if (commonGoods != null) {
commonGoodsService.addOrUpdateCommonGoods(commonGoods);
Long cid = commonGoods.getId();
- if (cid == null) {
+ if (cid != null) {
listCommonId.add(cid);
}
}
@@ -171,21 +167,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 +202,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
@@ -241,11 +239,6 @@
}
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);
@@ -258,11 +251,6 @@
}
// 鐢熸垚閾炬帴
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);
}
--
Gitblit v1.8.0