From 2c217c4f9e01bd2e764c7b62da1aaa89018d76d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 12:19:21 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 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..52fff57 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;
@@ -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("鎺ㄩ�佹垚鍔�"));
--
Gitblit v1.8.0