From 3d3a9b46b56ded968b1803456470b5ec31e43ce7 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 30 十一月 2018 14:10:42 +0800
Subject: [PATCH] 调整推送内容以及队员返回字段
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 84f4cda..82b4996 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
@@ -19,8 +19,10 @@
import com.yeshi.fanli.entity.common.AdminUser;
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.AdminUserService;
import com.yeshi.fanli.service.inter.push.PushGoodsGroupService;
import com.yeshi.fanli.service.inter.push.PushGoodsService;
@@ -28,6 +30,7 @@
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")
@@ -152,11 +155,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