From 8c6123908fd6bc5a02938dd1e69750b277aa5c6a Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期一, 09 三月 2020 16:27:38 +0800
Subject: [PATCH] 添加领取人明细 + 口令筛选商品
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsEvaluateAdminController.java | 108 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 32 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 da335a4..e5108b2 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
@@ -27,6 +27,7 @@
import com.yeshi.fanli.entity.dynamic.ListComment;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
@@ -34,15 +35,22 @@
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.manger.ClipboardAnalysisManager;
+import com.yeshi.fanli.service.manger.IClipboardAnalysisResult;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.common.JumpDetailContentVO;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.vo.msg.TokenVO;
+import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;
import net.sf.json.JSONObject;
@@ -74,6 +82,9 @@
@Resource
private HongBaoManageService hongBaoManageService;
+ private CommonGoods commonGoods;
+
+
/**
* 淇濆瓨淇℃伅
*
@@ -104,8 +115,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSingleGoods")
@@ -116,7 +126,8 @@
if (request instanceof MultipartHttpServletRequest) {
fileRequest = (MultipartHttpServletRequest) request;
}
- String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum, picUrls, fileRequest);
+ String commentText = goodsEvaluateService.saveSingleGoods(pid, goodsId, goodsType, videoUrl, picNum,
+ picUrls, fileRequest);
JSONObject object = new JSONObject();
object.put("comment", commentText);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));
@@ -132,8 +143,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveGoodsCoupon")
@@ -154,13 +164,13 @@
*
* @param callback
* @param pid
- * @param kind : 1鍗曞搧 2澶氬搧 3娲诲姩
+ * @param kind : 1鍗曞搧 2澶氬搧 3娲诲姩
* @param out
*/
@RequestMapping(value = "saveCurrencyCoupon")
public void saveCurrencyCoupon(String callback, String pid, int kind, CommentInfo commentInfo, PrintWriter out) {
try {
- goodsEvaluateService.saveCurrencyCoupon(pid, kind,commentInfo);
+ goodsEvaluateService.saveCurrencyCoupon(pid, kind, commentInfo);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (GoodsEvaluateException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -174,8 +184,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSingleGoodsinfo")
@@ -227,8 +236,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getCurrencyCoupon")
@@ -258,8 +266,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSingleGoodsCoupon")
@@ -309,8 +316,7 @@
LogHelper.test(e);
}
}
-
-
+
/**
*
* @param callback
@@ -337,7 +343,7 @@
e.printStackTrace();
}
}
-
+
/**
*
* @param callback
@@ -351,13 +357,13 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰厛淇濆瓨鎺ㄨ崘璇俊鎭�"));
return;
}
-
+
List<CommentInfo> newList = new ArrayList<>();
GoodsEvaluate goodsEvaluate = goodsEvaluateService.getById(id);
if (goodsEvaluate != null) {
List<CommentInfo> comments = goodsEvaluate.getComments();
if (comments != null && comments.size() > 0) {
- for (CommentInfo commentInfo: comments) {
+ for (CommentInfo commentInfo : comments) {
CommentInfoEnum typeEnum = commentInfo.getTypeEnum();
if (typeEnum == CommentInfoEnum.goodsCoupon) {
newList.add(commentInfo);
@@ -373,7 +379,6 @@
e.printStackTrace();
}
}
-
/**
* 鑾峰彇澶氫釜鍟嗗搧淇℃伅
@@ -422,8 +427,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveActivityPic")
@@ -448,8 +452,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getActivityPic")
@@ -490,8 +493,7 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "saveSuCai")
@@ -518,8 +520,7 @@
* 鑾峰彇淇℃伅
*
* @param callback
- * @param special
- * 0a39676f138c4dcba722e321d43c4284
+ * @param special 0a39676f138c4dcba722e321d43c4284
* @param out
*/
@RequestMapping(value = "getSuCaiPic")
@@ -560,7 +561,6 @@
}
}
-
/**
* 淇濆瓨淇℃伅
*
@@ -746,7 +746,11 @@
@RequestMapping(value = "getGoodsByUrl")
public void getGoodsByUrl(String callback, String link, PrintWriter out) {
try {
- CommonGoods commonGoods = clipboardAnalysisManager.parseLink(link);
+ //CommonGoods commonGoods = clipboardAnalysisManager.parseLink(link);
+ // 鏍规嵁鍙ｄ护閾炬帴鑾峰彇鍟嗗搧
+ getGoods(link);
+
+ CommonGoods commonGoods = getCommonGoods();
if (commonGoods == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈壘鍒拌鍟嗗搧"));
return;
@@ -763,17 +767,17 @@
String pictUrlWhite = goodsBrief.getPictUrlWhite();
if (!StringUtil.isNullOrEmpty(pictUrlWhite)) {
goodsBrief.setPictUrl(pictUrlWhite);
-
+
List<String> picList = new ArrayList<>();
picList.add(pictUrlWhite);
-
+
List<String> imgList = goodsBrief.getImgList();
if (imgList != null) {
picList.addAll(imgList);
}
goodsBrief.setImgList(picList);
}
-
+
goodsDetail = GoodsDetailVOFactory.convertTaoBao(goodsBrief, params);
} catch (TaobaoGoodsDownException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ュ晢鍝佸凡涓嬫灦"));
@@ -801,7 +805,37 @@
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
+ } finally {
+ setCommonGoods(null);
}
+
+ }
+
+ private void getGoods(String text) {
+ Long uid = Constant.LINK_TOKEN_VERIFY_UID;
+ clipboardAnalysisManager.parse("android", "55", text, uid, new IClipboardAnalysisResult() {
+ @Override
+ public void onResult(GoodsDocParseResultVO result) {}
+
+ @Override
+ public void onResult(String result) {}
+
+ @Override
+ public void onResult(CommonGoods goods) {
+ setCommonGoods(goods);
+ }
+
+ @Override
+ public void onResult(TokenVO tokenVO) {
+ }
+ @Override
+ public void none() {
+ }
+
+ @Override
+ public void needLogin(String msg) {
+ }
+ });
}
/**
@@ -920,4 +954,14 @@
}
}
+ public CommonGoods getCommonGoods() {
+ return commonGoods;
+ }
+
+ public void setCommonGoods(CommonGoods commonGoods) {
+ this.commonGoods = commonGoods;
+ }
+
+
+
}
--
Gitblit v1.8.0