From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
index fe1d57b..fd3848e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java
@@ -238,9 +238,10 @@
if (goodsEvaluate != null && goodsEvaluate.getComments() != null
&& goodsEvaluate.getComments().size() > 0) {
for (CommentInfo info : goodsEvaluate.getComments()) {
- if (CommentInfoEnum.currencyCoupon == info.getType()) {
- commentInfo = info;
- }
+ if (info != null)
+ if (CommentInfoEnum.currencyCoupon == info.getType()) {
+ commentInfo = info;
+ }
}
}
}
@@ -268,9 +269,10 @@
if (goodsEvaluate != null && goodsEvaluate.getComments() != null
&& goodsEvaluate.getComments().size() > 0) {
for (CommentInfo info : goodsEvaluate.getComments()) {
- if (CommentInfoEnum.goodsCoupon == info.getType()) {
- commentInfo = info;
- }
+ if (info != null)
+ if (CommentInfoEnum.goodsCoupon == info.getType()) {
+ commentInfo = info;
+ }
}
}
}
@@ -441,6 +443,53 @@
}
}
+ /**
+ * 鑾峰彇淇℃伅
+ *
+ * @param callback
+ * @param special
+ * 0a39676f138c4dcba722e321d43c4284
+ * @param out
+ */
+ @RequestMapping(value = "getSuCaiPic")
+ public void getSuCaiPic(String callback, String pid, PrintWriter out) {
+ try {
+ String videoUrl = "";
+ String videoPic = "";
+ String activityUrl = "";
+ List<String> list = new ArrayList<String>();
+ if (!StringUtil.isNullOrEmpty(pid)) {
+ GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
+ if (goodsEvaluate != null && goodsEvaluate.getImgList() != null
+ && goodsEvaluate.getImgList().size() > 0) {
+ List<ImgInfo> imgList = goodsEvaluate.getImgList();
+ for (ImgInfo imgInfo : imgList) {
+ ImgEnum type = imgInfo.getType();
+ if (type == ImgEnum.video) {
+ videoPic = imgInfo.getUrl();
+ videoUrl = imgInfo.getVideoUrl();
+ } else if (type == ImgEnum.activity) {
+ activityUrl = imgInfo.getActivityPic();
+ } else if (type == ImgEnum.img) {
+ list.add(imgInfo.getUrl());
+ }
+ }
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("activityUrl", activityUrl);
+ data.put("videoUrl", videoUrl);
+ data.put("videoPic", videoPic);
+ data.put("list", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
/**
* 淇濆瓨淇℃伅
*
@@ -635,8 +684,7 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
BigDecimal vipFanLiRate = hongBaoManageService.getVIPFanLiRate();
- ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
- vipFanLiRate);
+ ConfigParamsDTO params = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE, vipFanLiRate);
if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
try {
@@ -662,7 +710,7 @@
JSONObject object = new JSONObject();
object.put("goodsId", goodsDetail.getGoodsId());
object.put("goodsType", goodsDetail.getGoodsType());
- object.put("picUrl",goodsDetail.getPicUrl());
+ object.put("picUrl", goodsDetail.getPicUrl());
object.put("imgList", goodsDetail.getImgList());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
} catch (Exception e) {
--
Gitblit v1.8.0