From 5fffa0cbd5e72ffd51a0d4116449733292de8442 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期三, 04 三月 2020 14:02:41 +0800
Subject: [PATCH] 加入拼多多转链
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
index 28dccb4..c88a50c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -1,8 +1,10 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -18,7 +20,7 @@
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.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
@@ -76,7 +78,8 @@
pushGoodsService.save(pushGoods, list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
+ } catch (PushGoodsException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -143,13 +146,24 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁淇℃伅宸蹭笉瀛樺湪"));
return;
}
+
+ Date controlTime = pushGoods.getControlTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (controlTime == null) {
+ pushGoods.setTimeTask(false);
+ pushGoods.setControlTime_str("");
+ } else {
+ pushGoods.setTimeTask(true);
+ pushGoods.setControlTime_str(sdf.format(controlTime));
+ }
+
// 鐗堟湰澶勭悊
convertVersionList(pushGoods);
List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();
- List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushGoods.getId());
+ List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(id);
if (listGroup == null) {
listGroup = new ArrayList<PushGoodsGroup>();
} else {
@@ -162,8 +176,12 @@
}
}
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.create();
+
JSONObject data = new JSONObject();
- data.put("pushGoods", pushGoods);
+ data.put("pushGoods", gson.toJson(pushGoods));
data.put("listGroup", listgoods);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -205,6 +223,17 @@
}
for (PushGoods pushGoods : list) {
+
+ Date controlTime = pushGoods.getControlTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
+ if (controlTime == null) {
+ pushGoods.setTimeTask(false);
+ pushGoods.setControlTime_str("");
+ } else {
+ pushGoods.setTimeTask(true);
+ pushGoods.setControlTime_str(sdf.format(controlTime));
+ }
+
long countGoods = pushGoodsGroupService.countByPushId(pushGoods.getId());
pushGoods.setCountGoods(countGoods);
@@ -260,7 +289,7 @@
}
for (Long id: list) {
- pushGoodsService.executePush(id);
+ pushGoodsService.handPush(id);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
@@ -341,7 +370,7 @@
} else {
JSONObject json = JSONObject.fromObject(versions);
- String versionsIOS = json.getString("IOS");
+ String versionsIOS = json.optString("IOS");
if (versionsIOS != null && versionsIOS.trim().length() > 0) {
listIOS = Arrays.asList(versionsIOS.split(","));
}
--
Gitblit v1.8.0