From 9d35ba657fa5e3add766405d76e3ff8c4dcd4ad4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 15:38:00 +0800
Subject: [PATCH] 多系统兼容优化
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 69 +++++++++++++++-------------------
1 files changed, 31 insertions(+), 38 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 06e5ae7..3839cf0 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
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -104,7 +105,6 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "saveHead")
@@ -128,21 +128,27 @@
/**
* 淇濆瓨淇℃伅
- *
+ * @param acceptData
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
+ * @param pid
+ * @param goodsId
+ * @param goodsType
+ * @param videoUrl
+ * @param picNum
+ * @param picUrls
+ * @param request
* @param out
*/
@RequestMapping(value = "saveSingleGoods")
- public void saveSingleGoods(String callback, String pid, Long goodsId, Integer goodsType, String videoUrl,
- Integer picNum, String picUrls, HttpServletRequest request, PrintWriter out) {
+ public void saveSingleGoods(AdminAcceptData acceptData, String callback, String pid, String goodsId, Integer goodsType, String videoUrl,
+ Integer picNum, String picUrls, HttpServletRequest request, PrintWriter out) {
try {
MultipartHttpServletRequest fileRequest = null;
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum,
- picUrls, fileRequest);
+ picUrls,acceptData.getSystem(), fileRequest);
JSONObject object = new JSONObject();
object.put("comment", commentText);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
@@ -159,7 +165,6 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSingleGoodsinfo")
@@ -215,7 +220,7 @@
* @param out
*/
@RequestMapping(value = "saveGoodsComment")
- public void saveGoodsComment(String callback, String id, int kind, ListComment comments, PrintWriter out) {
+ public void saveGoodsComment(AdminAcceptData acceptData, String callback, String id, int kind, ListComment comments, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(id)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
@@ -225,7 +230,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏂囨湰鍐呭涓虹┖"));
return;
}
- goodsEvaluateService.saveGoodsComment(id, kind, comments.getComment());
+ goodsEvaluateService.saveGoodsComment(id, kind, comments.getComment(),acceptData.getSystem());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛"));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -238,7 +243,6 @@
/**
*
* @param callback
- * @param comments
* @param out
*/
@RequestMapping(value = "getGoodsComment")
@@ -297,7 +301,6 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getCurrencyCoupon")
@@ -403,18 +406,17 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveActivityPic")
- public void saveActivityPic(String callback, String pid, ImgInfo imgInfo, HttpServletRequest request,
+ public void saveActivityPic(String callback, String pid, ImgInfo imgInfo, String picUrls, HttpServletRequest request,
PrintWriter out) {
try {
MultipartHttpServletRequest fileRequest = null;
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
- goodsEvaluateService.saveActivityPic(pid, imgInfo, fileRequest);
+ goodsEvaluateService.saveActivityPic(pid, imgInfo,picUrls, fileRequest);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -428,7 +430,6 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getActivityPic")
@@ -436,19 +437,23 @@
try {
String videoPic = "";
String videoUrl = "";
- String activityPic = "";
String activityUrl = "";
+ List<String> list = new ArrayList<String>();
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(pid);
if (goodsEvaluate != null && goodsEvaluate.getImgList() != null && goodsEvaluate.getImgList().size() > 0) {
+ activityUrl = goodsEvaluate.getJumpLink();
+
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) {
- activityPic = imgInfo.getUrl();
- activityUrl = imgInfo.getActivityUrl();
+ } else {
+ list.add(imgInfo.getUrl());
+ if (StringUtil.isNullOrEmpty(activityUrl) && !StringUtil.isNullOrEmpty(imgInfo.getActivityUrl())) {
+ activityUrl = imgInfo.getActivityUrl();
+ }
}
}
}
@@ -456,7 +461,7 @@
JSONObject data = new JSONObject();
data.put("videoUrl", videoUrl);
data.put("videoPic", videoPic);
- data.put("activityPic", activityPic);
+ data.put("listPic", list);
data.put("activityUrl", activityUrl);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -469,7 +474,6 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSuCai")
@@ -496,7 +500,6 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSuCaiPic")
@@ -541,7 +544,6 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "getEvaluate")
@@ -604,12 +606,10 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param bannerId
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, String typeEnum, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -618,7 +618,7 @@
}
try {
- List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1);
+ List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 1, typeEnum,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -640,7 +640,7 @@
}
}
- long count = goodsEvaluateService.count(key, state, 1);
+ long count = goodsEvaluateService.count(key, state, 1, typeEnum,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -661,11 +661,10 @@
* @param callback
* @param pageIndex
* @param pageSize
- * @param bannerId
* @param out
*/
@RequestMapping(value = "querySuCai")
- public void querySuCai(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ public void querySuCai(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -675,7 +674,7 @@
}
try {
- List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2);
+ List<GoodsEvaluate> list = goodsEvaluateService.query((pageIndex - 1) * pageSize, pageSize, key, state, 2, null,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -697,7 +696,7 @@
}
}
- long count = goodsEvaluateService.count(key, state, 2);
+ long count = goodsEvaluateService.count(key, state, 2, null,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -716,7 +715,6 @@
* 鏍规嵁閾炬帴鏌ヨ鍟嗗搧
*
* @param callback
- * @param text
* @param out
*/
@RequestMapping(value = "getGoodsByUrl")
@@ -818,7 +816,6 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "saveComment")
@@ -871,7 +868,6 @@
* 鍒犻櫎淇℃伅
*
* @param callback
- * @param idArray
* @param out
*/
@RequestMapping(value = "release")
@@ -896,9 +892,6 @@
* 鏌ヨ鍝佽
*
* @param callback
- * @param pageIndex
- * @param pageSize
- * @param bannerId
* @param out
*/
@RequestMapping(value = "queryComment")
--
Gitblit v1.8.0