From d4d0c8326d031ff8a2d47d0305a021f3689b8e9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 08:55:48 +0800
Subject: [PATCH] 消息-其他增加
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 67e6360..8aa8c69 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
@@ -5,7 +5,6 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -16,9 +15,10 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.entity.common.AdminUser;
+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.service.AdminUserService;
@@ -27,7 +27,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@Controller
@RequestMapping("admin/new/api/v1/pushgoods")
@@ -49,20 +49,9 @@
* @param special
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "save")
- public void save(String callback, PushGoods pushGoods, Long uid, String idArray, HttpServletResponse response,
- PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
- if (admin == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鐢ㄦ埛楠岃瘉澶辫触"));
- return;
- }
-
+ public void save(String callback, PushGoods pushGoods, String idArray, PrintWriter out) {
+
try {
String alertTitle = pushGoods.getAlertTitle();
@@ -152,11 +141,24 @@
return;
}
+ List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();
+
List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushGoods.getId());
+ if (listGroup == null) {
+ listGroup = new ArrayList<PushGoodsGroup>();
+ } else {
+ for (PushGoodsGroup pushGoodsGroup: listGroup) {
+ CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
+ if (commonGoods != null) {
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
+ listgoods.add(goodsBrief);
+ }
+ }
+ }
JSONObject data = new JSONObject();
data.put("pushGoods", pushGoods);
- data.put("listGroup", listGroup);
+ data.put("listGroup", listgoods);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0