From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 218 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 187 insertions(+), 31 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 936229c..b7c6cbb 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
@@ -12,6 +12,10 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.push.PushGoodsMapper;
+import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
+import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
+import com.yeshi.fanli.entity.dynamic.ImgInfo;
+import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
@@ -20,6 +24,7 @@
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsService;
@@ -47,6 +52,11 @@
@Resource
private PushGoodsGroupService pushGoodsGroupService;
+
+ @Resource
+ private GoodsEvaluateService goodsEvaluateService;
+
+
@Override
public int deleteByPrimaryKey(Long id) throws PushGoodsException {
@@ -81,23 +91,14 @@
@Override
@Transactional(rollbackFor=Exception.class)
public void save(PushGoods record, List<Long> goodsIds) throws PushGoodsException, Exception {
-
// 瀹氭椂鏃堕棿
- Boolean timeTask = record.isTimeTask();
- if (timeTask != null && timeTask) {
- String controlTime_str = record.getControlTime_str();
- if (controlTime_str == null || controlTime_str.trim().length() == 0) {
- throw new PushGoodsException(1, "棰勮鏃堕棿涓嶈兘涓虹┖");
- }
-
+ if (StringUtil.isNullOrEmpty(record.getControlTime_str())) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- controlTime_str = controlTime_str.replaceAll("T", " ");
- record.setControlTime(format.parse(controlTime_str));
- } else {
- record.setControlTime(null);
+ record.setControlTime(format.parse(record.getControlTime_str().replaceAll("T", " ")));
}
record.setIsPush(PushGoods.STATE_INIT);
+ record.setType(PushGoods.TYPE_GOODS);
boolean isAdd = false;
// 鎺ㄩ�乮d
@@ -130,7 +131,6 @@
@Transactional(rollbackFor=Exception.class)
public void saveGoodsInfo(boolean isAdd, Long pushId, List<Long> goodsIds) throws Exception {
-
if (goodsIds == null || goodsIds.size() == 0) {
if (!isAdd) {
pushGoodsGroupService.deleteByPushId(pushId);
@@ -156,16 +156,12 @@
} catch (Exception e) {
e.printStackTrace();
}
-
}
/* 淇敼鏃跺垹闄� 閮ㄥ垎 */
if (!isAdd) {
-
List<Long> listdelete = new ArrayList<Long>();
-
List<PushGoodsGroup> listGroup = pushGoodsGroupService.selectByPushId(pushId);
-
if (listGroup != null && listGroup.size() > 0) {
for (PushGoodsGroup group : listGroup) {
Long groupId = group.getId();
@@ -199,11 +195,86 @@
pushGoodsGroup.setCommonGoods(new CommonGoods(cid));
listAdd.add(pushGoodsGroup);
}
-
pushGoodsGroupService.insertBatch(listAdd);
}
-
}
+
+
+ @Override
+ @Transactional(rollbackFor=Exception.class)
+ public void saveInfo(PushGoods record) throws PushGoodsException, Exception {
+ if (StringUtil.isNullOrEmpty(record.getOtherId())) {
+ throw new PushGoodsException(1, "鐩稿叧鍐呭ID涓嶈兘涓虹┖");
+ }
+
+ if (StringUtil.isNullOrEmpty(record.getTitle())) {
+ throw new PushGoodsException(1, "鏍囬涓嶈兘涓虹┖");
+ }
+
+ if (StringUtil.isNullOrEmpty(record.getContent())) {
+ throw new PushGoodsException(1, "鍐呭涓嶈兘涓虹┖");
+ }
+
+ if (record.getType() == null) {
+ throw new PushGoodsException(1, "鎺ㄩ�佺被鍨嬩笉鑳戒负绌�");
+ }
+
+ if (record.getType() == PushGoods.TYPE_ACTIVITY) {
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(record.getOtherId());
+ if (goodsEvaluate == null) {
+ throw new PushGoodsException(1, "鍙戝湀娲诲姩淇℃伅涓嶅瓨鍦�");
+ }
+
+ if (goodsEvaluate.getType() != EvaluateEnum.activity) {
+ throw new PushGoodsException(1, "璇ュ唴瀹归潪鍙戝湀娲诲姩淇℃伅");
+ }
+
+ String picUrl = null;
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ if (imgList != null && imgList.size() > 0) {
+ for (ImgInfo imgInfo: imgList) {
+ if (imgInfo.getType() == ImgEnum.img && !StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
+ picUrl = imgInfo.getUrl();
+ }
+ }
+ }
+ if (StringUtil.isNullOrEmpty(picUrl)) {
+ throw new PushGoodsException(1, "璇ラ潪鍙戝湀娲诲姩鏃犲浘鐗囦俊鎭�");
+ }
+ record.setPicture(picUrl);
+ }
+
+
+ // 瀹氭椂鏃堕棿
+ if (StringUtil.isNullOrEmpty(record.getControlTime_str())) {
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ record.setControlTime(format.parse(record.getControlTime_str().replaceAll("T", " ")));
+ }
+ // 娴忚鏁伴噺闅忔満
+ if (record.getScanNum() == null || record.getScanNum() <= 0)
+ record.setScanNum((int) (Math.random() * 5000) + 1000);
+
+ record.setIsPush(PushGoods.STATE_INIT);
+ record.setAlertTitle(record.getTitle());
+ record.setAlertContent(record.getContent());
+
+ Long id = record.getId();
+ if (id == null) {
+ record.setCreateTime(new Date());
+ pushGoodsMapper.insert(record);
+ } else {
+ PushGoods current = pushGoodsMapper.selectByPrimaryKey(id);
+ if (current == null) {
+ throw new PushGoodsException(1, "璇ヨ褰曞凡涓嶅瓨鍦�");
+ }
+ record.setCreateTime(current.getCreateTime());
+ record.setScanNum(current.getScanNum());
+ record.setUpdateTime(new Date());
+ pushGoodsMapper.updateByPrimaryKey(record);
+ }
+ }
+
+
@Override
@Transactional(rollbackFor=Exception.class)
@@ -292,15 +363,102 @@
@Override
public void executePush(PushGoods pushGoods) throws Exception, PushGoodsException, PushException {
-
- Long id = pushGoods.getId();
-
- String alertTitle = pushGoods.getAlertTitle();
- String alertContent = pushGoods.getAlertContent();
- if (StringUtil.isNullOrEmpty(alertTitle) || StringUtil.isNullOrEmpty(alertContent)) {
+ if (StringUtil.isNullOrEmpty(pushGoods.getTitle()) || StringUtil.isNullOrEmpty(pushGoods.getContent())) {
throw new PushGoodsException(1, "鎺ㄩ�佹爣棰樺強鍐呭涓嶈兘涓虹┖");
}
-
+
+ if (StringUtil.isNullOrEmpty(pushGoods.getVersions())) {
+ throw new PushGoodsException(1, "鎺ㄩ�佺増鏈笉鑳戒负绌�");
+ }
+
+ if (pushGoods.getType() == null || pushGoods.getType() == PushGoods.TYPE_GOODS) {
+ executePushGoods(pushGoods); // 鎺ㄩ�佸晢鍝�
+ } else if (pushGoods.getType() == PushGoods.TYPE_ACTIVITY) {
+ executePushActivity(pushGoods); // 鎺ㄩ�佹椿鍔�
+ }
+ }
+
+
+ /**
+ * 鎺ㄩ�佹椿鍔�
+ * @param pushGoods
+ * @throws Exception
+ * @throws PushGoodsException
+ * @throws PushException
+ */
+ private void executePushActivity(PushGoods pushGoods) throws Exception, PushGoodsException, PushException {
+ String otherId = pushGoods.getOtherId();
+ if (StringUtil.isNullOrEmpty(otherId)) {
+ throw new PushGoodsException(1, "娲诲姩id涓嶈兘涓虹┖");
+ }
+
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(otherId);
+ if (goodsEvaluate == null) {
+ throw new PushGoodsException(1, "鍙戝湀娲诲姩淇℃伅涓嶅瓨鍦�");
+ }
+
+ if (goodsEvaluate.getType() != EvaluateEnum.activity) {
+ throw new PushGoodsException(1, "璇ュ唴瀹归潪鍙戝湀娲诲姩淇℃伅");
+ }
+
+ String picUrl = null;
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ if (imgList != null && imgList.size() > 0) {
+ for (ImgInfo imgInfo: imgList) {
+ if (imgInfo.getType() == ImgEnum.img && !StringUtil.isNullOrEmpty(imgInfo.getUrl())) {
+ picUrl = imgInfo.getUrl();
+ }
+ }
+ }
+
+ if (StringUtil.isNullOrEmpty(picUrl)) {
+ throw new PushGoodsException(1, "璇ラ潪鍙戝湀娲诲姩鏃犲浘鐗囦俊鎭�");
+ }
+
+
+ String versions = pushGoods.getVersions();
+ JSONObject json = JSONObject.fromObject(versions);
+
+ String versionsIOS = json.getString("IOS");
+ List<String> listIOS = new ArrayList<String>();
+ 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(","));
+ }
+ }
+
+ String url = configService.get(ConfigKeyEnum.pushActivityLink.getKey());
+ if (StringUtil.isNullOrEmpty(url)) {
+ throw new PushGoodsException(1, "鎺ㄩ�侀〉闈㈤摼鎺ヤ笉瀛樺湪");
+ }
+ url = url + "?id=" + pushGoods.getId() + "&otherId=" + pushGoods.getOtherId();
+
+ // h娲诲姩鍏ㄦ帹
+ pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);
+ }
+
+
+ /**
+ * 鎺ㄩ�佸晢鍝�
+ * @param pushGoods
+ * @throws Exception
+ * @throws PushGoodsException
+ * @throws PushException
+ */
+ private void executePushGoods(PushGoods pushGoods) throws Exception, PushGoodsException, PushException {
+ Long id = pushGoods.getId();
List<PushGoodsGroup> goodsList = pushGoodsGroupService.getAllInfoByPushId(id);
if (goodsList == null || goodsList.size() == 0) {
throw new PushGoodsException(1, "鎺ㄩ�佹棤鍟嗗搧,璇峰畬鍠勬暟鎹�");
@@ -342,9 +500,7 @@
Long goodsId = commonGoods.getGoodsId();
String url = "https://item.taobao.com/item.htm?id=" + goodsId;
-
- pushService.pushGoods(pushGoods.getUid(), alertTitle, alertContent, url,listIOS, listAndroid);
-
+ pushService.pushGoods(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url,listIOS, listAndroid);
} else {
/* 澶氫釜鍟嗗搧鎺ㄩ�� */
String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());
@@ -353,9 +509,9 @@
}
// 鐢熸垚閾炬帴
url = url + "?id=" + id;
-
- pushService.pushUrl(pushGoods.getUid(), alertTitle, alertContent, url, listIOS, listAndroid);
+ pushService.pushUrl(pushGoods.getUid(), pushGoods.getTitle(), pushGoods.getContent(), url, listIOS, listAndroid);
}
}
+
}
--
Gitblit v1.8.0