From abf2ccd4a451d3c3c39ab65a56763bd0c76de39a Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 24 二月 2020 00:21:41 +0800
Subject: [PATCH] 发圈相关bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 19 ++++++++++---------
1 files changed, 10 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..0c57592 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;
+ }
}
}
}
@@ -635,8 +637,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 +663,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